diff options
| author | Melanie | 2012-02-18 22:21:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-18 22:21:10 +0000 |
| commit | 985526b662f47404404281a3ef4a35afa607bfbf (patch) | |
| tree | cbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.zip opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2 opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -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 d2810be..d0142a4 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
| @@ -230,8 +230,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
| 230 | 230 | ||
| 231 | m_scene.EventManager.OnEmptyScriptCompileQueue -= OnEmptyScriptCompileQueue; | 231 | m_scene.EventManager.OnEmptyScriptCompileQueue -= OnEmptyScriptCompileQueue; |
| 232 | 232 | ||
| 233 | m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}", | 233 | // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}", |
| 234 | m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString()); | 234 | // m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString()); |
| 235 | |||
| 236 | m_log.InfoFormat("[RegionReady]: Logins enabled for {0}", m_scene.RegionInfo.RegionName); | ||
| 235 | 237 | ||
| 236 | if ( m_uri != string.Empty ) | 238 | if ( m_uri != string.Empty ) |
| 237 | { | 239 | { |