OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
iar_mods
BlueWall 2012-01-18 20:30:57 -05:00
parent e7619f7518
commit eea726d74e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@ -100,12 +100,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
options.Add("s|skip-assets", delegate (string v) { skipAssets = v != null; }); options.Add("s|skip-assets", delegate (string v) { skipAssets = v != null; });
// Send a message to the region ready module // Send a message to the region ready module
/* bluewall* Disable this for the time being
IRegionReadyModule rready = m_scene.RequestModuleInterface<IRegionReadyModule>(); IRegionReadyModule rready = m_scene.RequestModuleInterface<IRegionReadyModule>();
if (rready != null) if (rready != null)
{ {
rready.OarLoadingAlert("load"); rready.OarLoadingAlert("load");
} }
*/
List<string> mainParams = options.Parse(cmdparams); List<string> mainParams = options.Parse(cmdparams);

6
OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
View File

@ -243,6 +243,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
public void OarLoadingAlert(string msg) public void OarLoadingAlert(string msg)
{ {
// Let's bypass this for now until some better feedback can be established
//
return;
if (msg == "load") if (msg == "load")
{ {
m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
@ -251,7 +255,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
m_scene.EventManager.OnRezScript += OnRezScript; m_scene.EventManager.OnRezScript += OnRezScript;
m_oarFileLoading = true; m_oarFileLoading = true;
m_firstEmptyCompileQueue = true; m_firstEmptyCompileQueue = true;
// Will need some controls around this
m_scene.LoginsDisabled = true; m_scene.LoginsDisabled = true;
m_scene.LoginLock = true; m_scene.LoginLock = true;
if ( m_uri != string.Empty ) if ( m_uri != string.Empty )