Revert changes on yubo (silan_refactoring branch)

code/ryzom/client/src/init_main_loop.cpp

@@ -1578,13 +1578,6 @@ void setLoadingContinent (CContinent *continent)
 
 void initWelcomeWindow()
 {
-	CSessionBrowserImpl	&sb = CSessionBrowserImpl::getInstance();
-	if (sb.CurrentJoinMode!=CFarTP::LaunchEditor && NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool())
-	{
-		std::vector<string> v;
-		CWidgetManager::getInstance()->runProcedure ("welcome_opened", NULL, v);
-	}
-	/*
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 	CInterfaceGroup* welcomeWnd = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:welcome_info"));
 	if(welcomeWnd)
@@ -1592,7 +1585,7 @@ void initWelcomeWindow()
 		bool welcomeDbProp  = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool();
 		CSessionBrowserImpl	&sb = CSessionBrowserImpl::getInstance();
 		welcomeWnd->setActive((sb.CurrentJoinMode!=CFarTP::LaunchEditor) && welcomeDbProp);
-	}*/
+	}
 }
 
 // ***************************************************************************

code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h

@@ -207,8 +207,8 @@ private:
 	static bool	isDynStringAvailable(sint32 dynStringId);
 	static bool	isFullyPatched();
 	static std::string getSheetType(const std::string &sheet);
-	static float getCharacterSheetScale(const std::string &sheet);
 	static std::string getSheetShape(const std::string &sheet);
+	static float getCharacterSheetScale(const std::string &sheet);
 	static std::string getSheetFamily(const std::string &sheet);
 	static std::string getSheetName(uint32 sheetId);
 	static sint32 getFameIndex(const std::string &factionName);