*Merge.

--HG--
branch : trunk

src/game/World.h

@@ -207,6 +207,7 @@ enum WorldConfigs
     CONFIG_NO_RESET_TALENT_COST,
     CONFIG_SHOW_KICK_IN_WORLD,
     CONFIG_INTERVAL_LOG_UPDATE,
+    CONFIG_MIN_LOG_UPDATE,
 	CONFIG_ENABLE_SINFO_LOGIN,
 
     CONFIG_VALUE_COUNT
@@ -528,6 +529,7 @@ class World
         void SetScriptsVersion(char const* version) { m_ScriptsVersion = version ? version : "unknown scripting library"; }
         char const* GetScriptsVersion() { return m_ScriptsVersion.c_str(); }
 
+        void RecordTimeDiff(const char * text, ...);
     protected:
         void _UpdateGameTime();
         void ScriptsProcess();
@@ -550,7 +552,6 @@ class World
         uint32 m_updateTime, m_updateTimeSum;
         uint32 m_updateTimeCount;
         uint32 m_currentTime;
-        void RecordTimeDiff(const char * text);
 
         typedef UNORDERED_MAP<uint32, Weather*> WeatherMap;
         WeatherMap m_weathers;