Merge

code/nel/src/3d/landscape_user.cpp

@@ -272,7 +272,7 @@ void	CLandscapeUser::refreshZonesAround(const CVector &pos, float radius, std::s
 		{
 			if (Work.Zone == (CZone*)-1)
 			{
-				nlwarning ("Can't load zone %s", Work.NameZoneAdded.c_str ());
+				//nlwarning ("Can't load zone %s", Work.NameZoneAdded.c_str ());
 			}
 			else
 			{

code/nel/src/3d/zone_manager.cpp

@@ -255,7 +255,7 @@ void CZoneLoadingTask::run(void)
 	}
 	else
 	{
-		nldebug("CZoneLoadingTask::run(): File not found: %s", zonePathLookup.c_str ());
+		//nldebug("CZoneLoadingTask::run(): File not found: %s", zonePathLookup.c_str ());
 		delete ZoneTmp;
 		*_Zone = (CZone*)-1; // Return error
 	}

code/nel/src/pacs/global_retriever.cpp

@@ -2516,7 +2516,7 @@ void	NLPACS::CGlobalRetriever::refreshLrAround(const CVector &position, float ra
 
 			//		NLMEMORY::CheckHeap (true);
 
-			nlinfo("Lr '%s' loading task complete", ite->LoadFile.c_str());
+			//nlinfo("Lr '%s' loading task complete", ite->LoadFile.c_str());
 
 			// Remove this entry
 			_LrLoaderList.erase (ite);
@@ -2553,7 +2553,7 @@ void	NLPACS::CGlobalRetriever::refreshLrAround(const CVector &position, float ra
 	for (it=out.begin(); it!=out.end(); ++it)
 	{
 		const_cast<CRetrieverBank*>(_RetrieverBank)->unloadRetriever(*it);
-		nlinfo("Freed Lr '%s'", (_RetrieverBank->getNamePrefix() + "_" + toString(*it) + ".lr").c_str());
+		//nlinfo("Freed Lr '%s'", (_RetrieverBank->getNamePrefix() + "_" + toString(*it) + ".lr").c_str());
 	}
 
 	// if load task idle and more lr to load, setup load task
@@ -2585,7 +2585,7 @@ void	NLPACS::CGlobalRetriever::refreshLrAround(const CVector &position, float ra
 
 			CAsyncFileManager::getInstance().addLoadTask(&loader);
 
-			nlinfo("Lr '%s' added to load", loader.LoadFile.c_str());
+			//nlinfo("Lr '%s' added to load", loader.LoadFile.c_str());
 		}
 
 		// Next lr to load

code/ryzom/client/src/animation_misc.cpp

@@ -120,7 +120,7 @@ bool CAnimationMisc::interpolate(UAnimationSet *animationSet, uint idAnim, doubl
 	UTrack* Track = anim->getTrackByName("rotquat");
 	if(!Track)
 	{
-		nlwarning("CAnimationMisc::interpolate(CQuat) : track with the name 'PathRotQuat' or 'rotquat' does not exist.");
+		//nlwarning("CAnimationMisc::interpolate(CQuat) : track with the name 'PathRotQuat' or 'rotquat' does not exist.");
 		return false;
 	}
 

code/ryzom/client/src/character_cl.cpp

@@ -1427,10 +1427,10 @@ void CCharacterCL::updateVisualPropertyName(const NLMISC::TGameCycle &/* gameCyc
 //	STRING_MANAGER::CStringManagerClient::instance()->waitString(nameId, this, &_Name);
 	STRING_MANAGER::CStringManagerClient::instance()->waitString(nameId, this);
 
-	if(!getEntityName().empty())
+	//if(!getEntityName().empty())
-		nlwarning("CH::updateVPName:%d: name Id '%d' received but no name allocated.", _Slot, nameId);
+	//	nlwarning("CH::updateVPName:%d: name Id '%d' received but no name allocated.", _Slot, nameId);
-	else if(verboseVP(this))
+	//else if(verboseVP(this))
-		nlinfo("(%05d,%03d) CH::updateVPName:%d: name '%s(%d)' received.", sint32(T1%100000), NetMngr.getCurrentServerTick(), _Slot, getEntityName().toString().c_str(), nameId);
+	//	nlinfo("(%05d,%03d) CH::updateVPName:%d: name '%s(%d)' received.", sint32(T1%100000), NetMngr.getCurrentServerTick(), _Slot, getEntityName().toString().c_str(), nameId);
 
 	updateMissionTarget();
 }// updateVisualPropertyName //
@@ -5429,8 +5429,8 @@ ADD_METHOD(void CCharacterCL::playToEndAnim(const double &startTimeOffset, doubl
 			}
 			return;
 		}
-		else
+		//else
-			nlwarning("playToEndAnim:%d: animWalkSpeed > animRunSpeed", _Slot);
+			//nlwarning("playToEndAnim:%d: animWalkSpeed > animRunSpeed", _Slot);
 	}
 	// No Mix between Walk and Run.
 	runFactor(0.0);

code/ryzom/client/src/libwww.cpp

@@ -234,16 +234,24 @@ void _VerifyLibWWW(const char *function, bool ok, const char *file, int line)
 
 int NelPrinter (const char * fmt, va_list pArgs)
 {
-	nlinfo (fmt, pArgs);
+	char info[1024];
-	return 0;
+	int ret;
+
+	ret = vsnprintf(info, sizeof(info), fmt, pArgs);
+	nlinfo("%s", info);
+	return ret;
 }
 
 // ***************************************************************************
 
 int NelTracer (const char * fmt, va_list pArgs)
 {
-	nlwarning (fmt, pArgs);
+	char err[1024];
-	return 0;
+	int ret;
+
+	ret = vsnprintf(err, sizeof(err), fmt, pArgs);
+	nlwarning ("%s", err);
+	return ret;
 }
 
 // ***************************************************************************
@@ -518,12 +526,14 @@ void setCurrentDomain(const std::string &url)
 	}
 }
 
-
 void initLibWWW()
 {
 	static bool initialized = false;
 	if (!initialized)
 	{
+		// log all libwww
+		//WWW_TraceFlag = SHOW_ALL_TRACE;
+
         //HTProfile_newNoCacheClient("Ryzom", "1.1");
 
 		/* Need our own trace and print functions */

code/ryzom/client/src/net_manager.cpp

@@ -3863,7 +3863,7 @@ void CNetManager::send(NLMISC::TGameCycle gameCycle)
 	// wait till next server is received
 	if (_LastSentCycle >= gameCycle)
 	{
-		nlinfo ("Try to CNetManager::send(%d) _LastSentCycle=%d more than one time with the same game cycle, so we wait new game cycle to send", gameCycle, _LastSentCycle);
+		//nlinfo ("Try to CNetManager::send(%d) _LastSentCycle=%d more than one time with the same game cycle, so we wait new game cycle to send", gameCycle, _LastSentCycle);
 		while (_LastSentCycle >= gameCycle)
 		{
 			// Update network.

code/ryzom/client/src/string_manager_client.cpp

@@ -357,7 +357,7 @@ restartLoop4:
 					{
 						bms.serial( stringId );
 						NetMngr.push( bms );
-						nldebug("<CStringManagerClient::getString> sending 'STRING_MANAGER:STRING_RQ' message to server");
+						//nldebug("<CStringManagerClient::getString> sending 'STRING_MANAGER:STRING_RQ' message to server");
 					}
 					else
 					{
@@ -393,7 +393,7 @@ restartLoop4:
 	{
 		H_AUTO( CStringManagerClient_receiveString )
 
-		nlinfo("String %u available : [%s]", stringId, str.toString().c_str());
+		//nlinfo("String %u available : [%s]", stringId, str.toString().c_str());
 
 		CHashSet<uint>::iterator	it(_WaitingStrings.find(stringId));
 		if (it != _WaitingStrings.end())
@@ -476,7 +476,7 @@ restartLoop:
 				/// Warning: if getDynString() return true, 'first' is erased => don't use it after in this loop
 				if (getDynString(number, value))
 				{
-					nlinfo("DynString %u available : [%s]", number, value.toString().c_str());
+					//nlinfo("DynString %u available : [%s]", number, value.toString().c_str());
 					// this dyn string is now complete !
 					// update the waiting dyn strings
 					{