aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/RegionReady
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-15 19:12:37 +0000
committerJustin Clarke Casey2009-04-15 19:12:37 +0000
commit63936d442ca7e6bdc0f09a5e974c57b3b5726353 (patch)
treeadd84f90ce716015e93f9dae721e7876992e6b6c /OpenSim/Region/OptionalModules/Scripting/RegionReady
parentConvert both script engines to new region module format. Add proper unload (diff)
downloadopensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.zip
opensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.tar.gz
opensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.tar.bz2
opensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.tar.xz
* Make it possible to add a request id to load and save oar requests
* This allows specific requests to be identified.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/RegionReady')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
index 6035712..4f57470 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
@@ -76,13 +76,13 @@ namespace OpenSim.Region.CoreModules.Scripting.RegionReady
76 { 76 {
77 if (m_enabled) 77 if (m_enabled)
78 { 78 {
79 m_log.Info("[RegionReady] Enabled"); 79 m_log.Info("[RegionReady]: Enabled");
80 m_scene.EventManager.OnEmptyScriptCompileQueue += new EventManager.EmptyScriptCompileQueue(OnEmptyScriptCompileQueue); 80 m_scene.EventManager.OnEmptyScriptCompileQueue += new EventManager.EmptyScriptCompileQueue(OnEmptyScriptCompileQueue);
81 m_scene.EventManager.OnOarFileLoaded += new EventManager.OarFileLoaded(OnOarFileLoaded); 81 m_scene.EventManager.OnOarFileLoaded += new EventManager.OarFileLoaded(OnOarFileLoaded);
82 } 82 }
83 else 83 else
84 { 84 {
85 m_log.Info("[RegionReady] Disabled"); 85 m_log.Info("[RegionReady]: Disabled");
86 } 86 }
87 } 87 }
88 88
@@ -129,20 +129,20 @@ namespace OpenSim.Region.CoreModules.Scripting.RegionReady
129 c.Sender = null; 129 c.Sender = null;
130 c.SenderUUID = UUID.Zero; 130 c.SenderUUID = UUID.Zero;
131 131
132 m_log.InfoFormat("[RegionReady] Region \"{0}\" is ready: \"{1}\" on channel {2}", 132 m_log.InfoFormat("[RegionReady]: Region \"{0}\" is ready: \"{1}\" on channel {2}",
133 m_scene.RegionInfo.RegionName, c.Message, m_channelNotify); 133 m_scene.RegionInfo.RegionName, c.Message, m_channelNotify);
134 m_scene.EventManager.TriggerOnChatBroadcast(this, c); 134 m_scene.EventManager.TriggerOnChatBroadcast(this, c);
135 } 135 }
136 } 136 }
137 137
138 void OnOarFileLoaded(string message) 138 void OnOarFileLoaded(Guid requestId, string message)
139 { 139 {
140 m_oarFileLoading = true; 140 m_oarFileLoading = true;
141 if (message==String.Empty) 141 if (message==String.Empty)
142 { 142 {
143 m_lastOarLoadedOk = true; 143 m_lastOarLoadedOk = true;
144 } else { 144 } else {
145 m_log.InfoFormat("[RegionReady] Oar file load errors: {0}", message); 145 m_log.InfoFormat("[RegionReady]: Oar file load errors: {0}", message);
146 m_lastOarLoadedOk = false; 146 m_lastOarLoadedOk = false;
147 } 147 }
148 } 148 }