aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule
diff options
context:
space:
mode:
authorBlueWall2012-01-18 20:30:57 -0500
committerBlueWall2012-01-18 20:30:57 -0500
commiteea726d74ecafb9383d2ae7ec257d1fc5b6782b0 (patch)
tree08190727f7709fb5cf348ef919666efc588e6b25 /OpenSim/Region/OptionalModules/Scripting/RegionReadyModule
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
downloadopensim-SC_OLD-eea726d74ecafb9383d2ae7ec257d1fc5b6782b0.zip
opensim-SC_OLD-eea726d74ecafb9383d2ae7ec257d1fc5b6782b0.tar.gz
opensim-SC_OLD-eea726d74ecafb9383d2ae7ec257d1fc5b6782b0.tar.bz2
opensim-SC_OLD-eea726d74ecafb9383d2ae7ec257d1fc5b6782b0.tar.xz
RegionReady:
Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/RegionReadyModule')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index feef49b..d2810be 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -243,6 +243,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
243 243
244 public void OarLoadingAlert(string msg) 244 public void OarLoadingAlert(string msg)
245 { 245 {
246 // Let's bypass this for now until some better feedback can be established
247 //
248 return;
249
246 if (msg == "load") 250 if (msg == "load")
247 { 251 {
248 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; 252 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
@@ -251,7 +255,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
251 m_scene.EventManager.OnRezScript += OnRezScript; 255 m_scene.EventManager.OnRezScript += OnRezScript;
252 m_oarFileLoading = true; 256 m_oarFileLoading = true;
253 m_firstEmptyCompileQueue = true; 257 m_firstEmptyCompileQueue = true;
254 // Will need some controls around this 258
255 m_scene.LoginsDisabled = true; 259 m_scene.LoginsDisabled = true;
256 m_scene.LoginLock = true; 260 m_scene.LoginLock = true;
257 if ( m_uri != string.Empty ) 261 if ( m_uri != string.Empty )