Merge branch 'fixes' into main/atys-pre-live

nel/src/gui/lua_ihm.cpp

@@ -1123,7 +1123,6 @@ namespace NLGUI
 		if(!pIE)
 		{
 			ls.pushNil();
-			nlerror("getCurrentWindowUnder(): No UICaller found. return Nil");
 		}
 		else
 		{
@@ -1672,7 +1671,7 @@ namespace NLGUI
 		ls.registerFunc("runFct",    runFct);
 		ls.registerFunc("runCommand",    runCommand);
 		ls.registerFunc("getPathContent", getPathContent);
-		
+
 		// Through LUABind API
 		lua_State	*L= ls.getStatePointer();
 

nel/src/gui/lua_manager.cpp

@@ -70,7 +70,17 @@ namespace NLGUI
 		}
 		catch( const ELuaError &e )
 		{
-			nlwarning( e.luaWhat().c_str() );
+			#if !FINAL_VERSION
+			nlwarning("--- LUA ERROR ---");
+			nlwarning(e.luaWhat().c_str());
+			std::vector<std::string> res;
+			NLMISC::explode(luaScript, std::string("\n"), res);
+			for(uint k = 0; k < res.size(); ++k)
+			{
+				nlwarning("%.05u %s", k, res[k].c_str());
+			}
+			nlwarning("--- ********* ---");
+			#endif
 			return false;
 		}
 

ryzom/client/src/interface_v3/chat_window.cpp

@@ -1027,10 +1027,7 @@ void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f)
 			title = sTitle.toUtf8();
 		}
 		else
-		{
+			f.serial(title);
-			string sTitle;
-			f.serial(sTitle);
-		}
 
 		CGroupContainer *pGC = createFreeTeller(title, "");
 

ryzom/common/src/game_share/ryzom_version.h

@@ -18,6 +18,7 @@
 #define RYZOM_VERSION_H
 
 #define RYZOM_VERSION "3.0.0"
+#define RYZOM_PRODUCT_VERSION "3.0.0"
 
 #endif // RYZOM_VERSION_H