From eea726d74ecafb9383d2ae7ec257d1fc5b6782b0 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 18 Jan 2012 20:30:57 -0500
Subject: 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.
---
 OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs         | 2 ++
 .../Scripting/RegionReadyModule/RegionReadyModule.cs                | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index a945fc2..0b22598 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -100,12 +100,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             options.Add("s|skip-assets", delegate (string v) { skipAssets = v != null; });
 
             // Send a message to the region ready module
+            /* bluewall* Disable this for the time being
             IRegionReadyModule rready = m_scene.RequestModuleInterface<IRegionReadyModule>();
 
             if (rready != null)
             {
                 rready.OarLoadingAlert("load");
             }
+            */
             
             List<string> mainParams = options.Parse(cmdparams);
           
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
 
         public void OarLoadingAlert(string msg)
         {
+            // Let's bypass this for now until some better feedback can be established
+            //
+            return;
+
             if (msg == "load")
             {
                 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
@@ -251,7 +255,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 m_scene.EventManager.OnRezScript  += OnRezScript;
                 m_oarFileLoading = true;
                 m_firstEmptyCompileQueue = true;
-                // Will need some controls around this
+                
                 m_scene.LoginsDisabled = true;
                 m_scene.LoginLock = true;
                 if ( m_uri != string.Empty )
-- 
cgit v1.1