aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMic Bowman2012-01-14 23:43:21 -0800
committerMic Bowman2012-01-14 23:43:21 -0800
commit2e4fbe6b176a2c4b65b819eae6e58f1510dcc95f (patch)
treebf3e8673d0f159f3ea2cd359e912e4fe99415bd9 /OpenSim
parentcommented out redundant land owner checks for osTeleportAgent there is (diff)
downloadopensim-SC-2e4fbe6b176a2c4b65b819eae6e58f1510dcc95f.zip
opensim-SC-2e4fbe6b176a2c4b65b819eae6e58f1510dcc95f.tar.gz
opensim-SC-2e4fbe6b176a2c4b65b819eae6e58f1510dcc95f.tar.bz2
opensim-SC-2e4fbe6b176a2c4b65b819eae6e58f1510dcc95f.tar.xz
protect the region ready alerts for loading oarfiles if no post URI is set
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index f5d4da8..feef49b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -254,8 +254,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
254 // Will need some controls around this 254 // Will need some controls around this
255 m_scene.LoginsDisabled = true; 255 m_scene.LoginsDisabled = true;
256 m_scene.LoginLock = true; 256 m_scene.LoginLock = true;
257 RRAlert("loading oar"); 257 if ( m_uri != string.Empty )
258 RRAlert("disabled"); 258 {
259 RRAlert("loading oar");
260 RRAlert("disabled");
261 }
259 } 262 }
260 } 263 }
261 264