aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorMelanie2012-01-16 23:08:47 +0000
committerMelanie2012-01-16 23:08:47 +0000
commitb14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b (patch)
tree1536dc38dbe3cd4d690cf02eb26d2ae191d1b903 /OpenSim/Region/OptionalModules/Scripting
parentAdd methods to allow the groups modules to query online status and last login (diff)
parentComment out noisy log lines I accidentally included in the nant build target ... (diff)
downloadopensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.zip
opensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.tar.gz
opensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.tar.bz2
opensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-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