diff --git a/nel/src/gui/lua_ihm.cpp b/nel/src/gui/lua_ihm.cpp index 229cd1f0f..8d4d64b88 100644 --- a/nel/src/gui/lua_ihm.cpp +++ b/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(); diff --git a/nel/src/gui/lua_manager.cpp b/nel/src/gui/lua_manager.cpp index 31f2a4450..7034f6b7e 100644 --- a/nel/src/gui/lua_manager.cpp +++ b/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 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; } diff --git a/ryzom/client/src/interface_v3/chat_window.cpp b/ryzom/client/src/interface_v3/chat_window.cpp index 9928b37b5..226de8549 100644 --- a/ryzom/client/src/interface_v3/chat_window.cpp +++ b/ryzom/client/src/interface_v3/chat_window.cpp @@ -1027,10 +1027,7 @@ void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f) title = sTitle.toUtf8(); } else - { - string sTitle; - f.serial(sTitle); - } + f.serial(title); CGroupContainer *pGC = createFreeTeller(title, ""); diff --git a/ryzom/common/src/game_share/ryzom_version.h b/ryzom/common/src/game_share/ryzom_version.h index 2dd050042..dcb337094 100644 --- a/ryzom/common/src/game_share/ryzom_version.h +++ b/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