diff options
author | Justin Clark-Casey (justincc) | 2012-07-18 21:29:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-18 21:29:12 +0100 |
commit | 6460e587c470361173291337ad222f48c13a10ce (patch) | |
tree | 30a15cc14b348793a16a1d4f121b64059659a6f5 /OpenSim/Region/OptionalModules | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-6460e587c470361173291337ad222f48c13a10ce.zip opensim-SC_OLD-6460e587c470361173291337ad222f48c13a10ce.tar.gz opensim-SC_OLD-6460e587c470361173291337ad222f48c13a10ce.tar.bz2 opensim-SC_OLD-6460e587c470361173291337ad222f48c13a10ce.tar.xz |
Pass entire scene object in OnLoginsEnabled event rather than just the region name.
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index aeab61c..29515de 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
59 | private bool m_disable_logins; | 59 | private bool m_disable_logins; |
60 | private string m_uri = string.Empty; | 60 | private string m_uri = string.Empty; |
61 | 61 | ||
62 | Scene m_scene = null; | 62 | Scene m_scene; |
63 | 63 | ||
64 | #region INonSharedRegionModule interface | 64 | #region INonSharedRegionModule interface |
65 | 65 | ||
@@ -192,7 +192,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
192 | m_scene.RegionInfo.RegionName, c.Message, m_channelNotify); | 192 | m_scene.RegionInfo.RegionName, c.Message, m_channelNotify); |
193 | 193 | ||
194 | m_scene.EventManager.TriggerOnChatBroadcast(this, c); | 194 | m_scene.EventManager.TriggerOnChatBroadcast(this, c); |
195 | m_scene.EventManager.TriggerLoginsEnabled(m_scene.RegionInfo.RegionName); | 195 | m_scene.EventManager.TriggerLoginsEnabled(m_scene); |
196 | m_scene.SceneGridService.InformNeighborsThatRegionisUp(m_scene.RequestModuleInterface<INeighbourService>(), m_scene.RegionInfo); | 196 | m_scene.SceneGridService.InformNeighborsThatRegionisUp(m_scene.RequestModuleInterface<INeighbourService>(), m_scene.RegionInfo); |
197 | } | 197 | } |
198 | } | 198 | } |
@@ -200,20 +200,28 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
200 | void OnOarFileLoaded(Guid requestId, string message) | 200 | void OnOarFileLoaded(Guid requestId, string message) |
201 | { | 201 | { |
202 | m_oarFileLoading = true; | 202 | m_oarFileLoading = true; |
203 | |||
203 | if (message==String.Empty) | 204 | if (message==String.Empty) |
204 | { | 205 | { |
205 | m_lastOarLoadedOk = true; | 206 | m_lastOarLoadedOk = true; |
206 | } else { | 207 | } |
208 | else | ||
209 | { | ||
207 | m_log.WarnFormat("[RegionReady]: Oar file load errors: {0}", message); | 210 | m_log.WarnFormat("[RegionReady]: Oar file load errors: {0}", message); |
208 | m_lastOarLoadedOk = false; | 211 | m_lastOarLoadedOk = false; |
209 | } | 212 | } |
210 | } | 213 | } |
211 | 214 | ||
212 | // This will be triggerd by Scene if we have no scripts | 215 | /// <summary> |
213 | // m_ScriptsRezzing will be false if there were none | 216 | /// This will be triggered by Scene directly if it contains no scripts on startup. |
214 | // else it will be true and we should wait on the | 217 | /// </summary> |
215 | // empty compile queue | 218 | /// <remarks> |
216 | void OnLoginsEnabled(string regionName) | 219 | /// m_ScriptsRezzing will be false if there were none |
220 | /// else it will be true and we should wait on the | ||
221 | /// empty compile queue | ||
222 | /// </remarks> | ||
223 | /// <param name='scene'></param> | ||
224 | void OnLoginsEnabled(IScene scene) | ||
217 | { | 225 | { |
218 | if (m_scene.StartDisabled == false) | 226 | if (m_scene.StartDisabled == false) |
219 | { | 227 | { |