Merge branch 'atys' into yubo

nel/include/nel/misc/xml_macros.h

@@ -72,3 +72,4 @@
 
 #endif // XML_MACROS_H
 
+

nel/src/3d/lod_character_manager.cpp

@@ -981,10 +981,11 @@ void			CLodCharacterManager::addTextureCompute(CLodCharacterInstance &instance,
 		return;
 
 	// get lookup ptr.
-	nlassert(lodTexture.Texture.size()==NL3D_CLOD_TEXT_SIZE);
 	if (lodTexture.Texture.size() < NL3D_CLOD_TEXT_SIZE)
 		return;
 	
+	nlassert(lodTexture.Texture.size()==NL3D_CLOD_TEXT_SIZE);
+
 	const CLodCharacterTexture::CTUVQ		*lookUpPtr= &lodTexture.Texture[0];
 
 	// apply the lodTexture, taking only better quality (ie nearer 0)

ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -3658,9 +3658,6 @@ void			CInventoryManager::updateItemInfoQueue()
 		return;
 	}
 
-	// CONNECTION:READY not yet sent, so we cannot send requests yet!
-	nlassert(ConnectionReadySent || !_ItemInfoWaiters.size());
-
 	// For All waiters, look if one need update.
 	TItemInfoWaiters::iterator	it;
 	for(it= _ItemInfoWaiters.begin();it!=_ItemInfoWaiters.end();it++)

ryzom/client/src/login.cpp

@@ -3300,7 +3300,6 @@ bool loginIntroSkip;
 void loginIntro()
 {
 	// Display of nevrax logo is done at init time (see init.cpp) just before addSearchPath (second one)
-#if 0
 	for (uint i = 0; i < 1; i++) // previously display nevrax then nvidia
 	{
 		if (i != 0)
@@ -3338,7 +3337,6 @@ void loginIntro()
 			NLGUI::CDBManager::getInstance()->flushObserverCalls();
 		}
 	}
-#endif
 	beginLoading(StartBackground);
 	ProgressBar.finish();
 }