diff options
| author | Melanie | 2012-01-21 19:52:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-21 19:52:33 +0000 |
| commit | ba3b0c69f11aaa3b4305cddd57099e98325a146d (patch) | |
| tree | cf70355a8cac0579354e67eeb3632a6706d41012 /OpenSim/Region/OptionalModules/Scripting | |
| parent | Add some logging (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-ba3b0c69f11aaa3b4305cddd57099e98325a146d.zip opensim-SC-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.gz opensim-SC-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.bz2 opensim-SC-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 6 |
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 ) |