diff options
author | Robert Adams | 2013-12-01 15:51:42 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-01 15:51:42 -0800 |
commit | 31bacfbb63a3871af1ff1fbaec2acd5f5021c926 (patch) | |
tree | fe9b9d826c1fdef55840d346ff5c9c481a4bfc82 /OpenSim/Region/OptionalModules/Scripting | |
parent | varregion: Add MaxRegionSize constant and enforce in RegionInfo. (diff) | |
parent | Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced fo... (diff) | |
download | opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.zip opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.gz opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.bz2 opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 3317b21..c6e4a7b 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -105,7 +105,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
105 | m_scene.LoginLock = true; | 105 | m_scene.LoginLock = true; |
106 | m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; | 106 | m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; |
107 | 107 | ||
108 | m_log.InfoFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name); | 108 | // Warn level because the region cannot be used while logins are disabled |
109 | m_log.WarnFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name); | ||
109 | 110 | ||
110 | if (m_uri != string.Empty) | 111 | if (m_uri != string.Empty) |
111 | { | 112 | { |
@@ -218,7 +219,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
218 | // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}", | 219 | // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}", |
219 | // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString()); | 220 | // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString()); |
220 | 221 | ||
221 | m_log.InfoFormat( | 222 | // Warn level because the region cannot be used while logins are disabled |
223 | m_log.WarnFormat( | ||
222 | "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); | 224 | "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); |
223 | } | 225 | } |
224 | 226 | ||