diff options
-rwxr-xr-x | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 8 | ||||
-rwxr-xr-x | OpenSim/Server/Base/ServicesServerBase.cs | 1 | ||||
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index fb059bd..988ada1 100755 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
104 | if (m_disable_logins) | 104 | if (m_disable_logins) |
105 | { | 105 | { |
106 | m_scene.LoginLock = true; | 106 | m_scene.LoginLock = true; |
107 | m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; | 107 | //// m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; |
108 | 108 | ||
109 | // This should always show up to the user but should not trigger warn/errors as these messages are | 109 | // This should always show up to the user but should not trigger warn/errors as these messages are |
110 | // expected and are not simulator problems. Ideally, there would be a status level in log4net but | 110 | // expected and are not simulator problems. Ideally, there would be a status level in log4net but |
@@ -116,6 +116,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
116 | RRAlert("disabled"); | 116 | RRAlert("disabled"); |
117 | } | 117 | } |
118 | } | 118 | } |
119 | m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; | ||
119 | } | 120 | } |
120 | 121 | ||
121 | public void RemoveRegion(Scene scene) | 122 | public void RemoveRegion(Scene scene) |
@@ -232,7 +233,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
232 | // without info log messages enabled. Making this a warning is arguably misleading since it isn't a | 233 | // without info log messages enabled. Making this a warning is arguably misleading since it isn't a |
233 | // warning, and monitor scripts looking for warn/error/fatal messages will received false positives. | 234 | // warning, and monitor scripts looking for warn/error/fatal messages will received false positives. |
234 | // Arguably, log4net needs a status log level (like Apache). | 235 | // Arguably, log4net needs a status log level (like Apache). |
235 | MainConsole.Instance.Output("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); | 236 | if (m_disable_logins) |
237 | m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); | ||
238 | else | ||
239 | m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0}", m_scene.Name); | ||
236 | } | 240 | } |
237 | 241 | ||
238 | m_scene.SceneGridService.InformNeighborsThatRegionisUp( | 242 | m_scene.SceneGridService.InformNeighborsThatRegionisUp( |
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 8c16f61..3d87097 100755 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -357,6 +357,7 @@ namespace OpenSim.Server.Base | |||
357 | Uri configUri; | 357 | Uri configUri; |
358 | IConfigSource s = null; | 358 | IConfigSource s = null; |
359 | 359 | ||
360 | System.Console.WriteLine("[CONFIG]: Reading configuration file. {0}", Path.GetFullPath(iniFile)); | ||
360 | try | 361 | try |
361 | { | 362 | { |
362 | if (Uri.TryCreate(iniFile, UriKind.Absolute, out configUri) && | 363 | if (Uri.TryCreate(iniFile, UriKind.Absolute, out configUri) && |
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index c180ca6..f1a7c97 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
@@ -190,6 +190,8 @@ namespace OpenSim.Server | |||
190 | 190 | ||
191 | loader = new PluginLoader(m_Server.Config, registryLocation); | 191 | loader = new PluginLoader(m_Server.Config, registryLocation); |
192 | 192 | ||
193 | m_log.InfoFormat("[SERVER]: INITIALIZATION COMPLETE FOR ROBUST\n\n"); | ||
194 | |||
193 | int res = m_Server.Run(); | 195 | int res = m_Server.Run(); |
194 | 196 | ||
195 | if(m_Server != null) | 197 | if(m_Server != null) |