Merge

.hgignore

@@ -251,3 +251,9 @@ code/nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
 code/web/public_php/config.php
 code/web/public_php/is_installed
 code/web/public_php/ams/files
+code/web/public_php/db_version_lib
+code/web/public_php/db_version_shard
+code/web/public_php/db_version_tool
+code/web/public_php/db_version_web
+code/web/public_php/role_service
+code/web/public_php/role_support

code/nel/include/nel/3d/scene.h

@@ -826,7 +826,7 @@ private:
 	void									flushSSSModelRequests();
 	// common vb for water display
 	CVertexBuffer	 _WaterVB;
-	
+
 	bool			_RequestParticlesAnimate;
 
 };

code/nel/include/nel/misc/app_context.h

@@ -147,7 +147,6 @@ namespace NLMISC
 		bool DebugNeedAssert;
 		bool NoAssert;
 		bool AlreadyCreateSharedAmongThreads;
-
 	};
 
 	/** This class implements the context interface for the a library module.
@@ -184,6 +183,7 @@ namespace NLMISC
 		virtual void setNoAssert(bool noAssert);
 		virtual bool getAlreadyCreateSharedAmongThreads();
 		virtual void setAlreadyCreateSharedAmongThreads(bool b);
+
 	private:
 		/// Pointer to the application context.
 		INelContext		*_ApplicationContext;

code/nel/samples/3d/nel_qt/qtcolorpicker_cpp.h

@@ -543,14 +543,17 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog,
     setMouseTracking(true);
     cols = width;
 
-    if (withColorDialog) {
-	moreButton = new ColorPickerButton(this);
-	moreButton->setFixedWidth(24);
-	moreButton->setFixedHeight(21);
-	moreButton->setFrameRect(QRect(2, 2, 20, 17));
-	connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
-    } else {
-	moreButton = 0;
+    if (withColorDialog)
+	{
+		moreButton = new ColorPickerButton(this);
+		moreButton->setFixedWidth(24);
+		moreButton->setFixedHeight(21);
+		moreButton->setFrameRect(QRect(2, 2, 20, 17));
+		connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
+    }
+	else
+	{
+		moreButton = 0;
     }
 
     eventLoop = 0;
@@ -1059,15 +1062,20 @@ void ColorPickerButton::mouseReleaseEvent(QMouseEvent *)
 void ColorPickerButton::keyPressEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Up
-	|| e->key() == Qt::Key_Down
-	|| e->key() == Qt::Key_Left
-	|| e->key() == Qt::Key_Right) {
-	qApp->sendEvent(parent(), e);
-    } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return) {
-	setFrameShadow(Sunken);
-	update();
-    } else {
-	QFrame::keyPressEvent(e);
+		|| e->key() == Qt::Key_Down
+		|| e->key() == Qt::Key_Left
+		|| e->key() == Qt::Key_Right)
+	{
+		qApp->sendEvent(parent(), e);
+    }
+	else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return)
+	{
+		setFrameShadow(Sunken);
+		update();
+    }
+	else
+	{
+		QFrame::keyPressEvent(e);
     }
 }
 
@@ -1077,16 +1085,21 @@ void ColorPickerButton::keyPressEvent(QKeyEvent *e)
 void ColorPickerButton::keyReleaseEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Up
-	|| e->key() == Qt::Key_Down
-	|| e->key() == Qt::Key_Left
-	|| e->key() == Qt::Key_Right) {
-	qApp->sendEvent(parent(), e);
-    } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return) {
-	setFrameShadow(Raised);
-	repaint();
-	emit clicked();
-    } else {
-	QFrame::keyReleaseEvent(e);
+		|| e->key() == Qt::Key_Down
+		|| e->key() == Qt::Key_Left
+		|| e->key() == Qt::Key_Right)
+	{
+		qApp->sendEvent(parent(), e);
+    }
+	else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return)
+	{
+		setFrameShadow(Raised);
+		repaint();
+		emit clicked();
+    }
+	else
+	{
+		QFrame::keyReleaseEvent(e);
     }
 
 }

code/nel/src/3d/driver/direct3d/driver_direct3d.cpp

@@ -1511,8 +1511,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
 		}
 	}
 
-
-	
 //	_D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
 
 	// Check some caps
@@ -2661,7 +2659,8 @@ bool CDriverD3D::reset (const GfxMode& mode)
 #ifndef NL_NO_ASM
 		CFpuRestorer fpuRestorer; // fpu control word is changed by "Reset"
 #endif
-		if (_Rasterizer!=D3DDEVTYPE_REF) {
+		if (_Rasterizer!=D3DDEVTYPE_REF)
+		{
 			HRESULT hr = _DeviceInterface->Reset (&parameters);
 			if (hr != D3D_OK)
 			{

code/nel/src/misc/app_context.cpp

@@ -75,7 +75,7 @@ INelContext::~INelContext()
 
 
 
-void	INelContext::contextReady()
+void INelContext::contextReady()
 {
 	// Register the NeL Context
 	// This assert doesn't work for Linux due to ELF symbol relocation

code/web/public_php/ams/templates/layout.tpl

@@ -158,7 +158,7 @@
 		</div>
 
 		<footer>
-			<p class="pull-right">Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>
+			{if $permission > 1}<p class="pull-right">AMS 0.9.0 Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>{/if}
 		</footer>
 		{/if}
 	</div><!--/.fluid-container-->