diff options
author | Teravus Ovares | 2007-11-28 06:18:07 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-28 06:18:07 +0000 |
commit | b7d596a6af51bea7dba642cdc768ac5ff77af5f3 (patch) | |
tree | 967b749b10b548f6ed687d8ade4680e411793da4 /OpenSim/Region/Communications/Local | |
parent | build ThrottleCheck function to clear up bits of the throttle (diff) | |
download | opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.zip opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.gz opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.bz2 opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.xz |
* Restaring the sim works fine in grid mode now. Sims announce themselves to their neighbors when they start up. Neighbors get this message and tell their agents that there's a new sim up.
* Certain unrecoverable physics based crashes in ODE are now hooked up to the 'restart the sim' routine.
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 6e807ec..0f3ec73 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -106,7 +106,6 @@ namespace OpenSim.Region.Communications.Local | |||
106 | 106 | ||
107 | return regionHost; | 107 | return regionHost; |
108 | } | 108 | } |
109 | return null; | ||
110 | } | 109 | } |
111 | 110 | ||
112 | public bool DeregisterRegion(RegionInfo regionInfo) | 111 | public bool DeregisterRegion(RegionInfo regionInfo) |
@@ -201,8 +200,9 @@ namespace OpenSim.Region.Communications.Local | |||
201 | /// <param name="agentData"></param> | 200 | /// <param name="agentData"></param> |
202 | /// <returns></returns> | 201 | /// <returns></returns> |
203 | /// | 202 | /// |
204 | public bool RegionUp(RegionInfo region) | 203 | public bool RegionUp(SearializableRegionInfo sregion) |
205 | { | 204 | { |
205 | RegionInfo region = new RegionInfo(sregion); | ||
206 | foreach (RegionCommsListener listener in m_regionListeners.Values) | 206 | foreach (RegionCommsListener listener in m_regionListeners.Values) |
207 | { | 207 | { |
208 | listener.TriggerRegionUp(region); | 208 | listener.TriggerRegionUp(region); |
@@ -213,8 +213,13 @@ namespace OpenSim.Region.Communications.Local | |||
213 | 213 | ||
214 | public bool TriggerRegionUp(RegionInfo region) | 214 | public bool TriggerRegionUp(RegionInfo region) |
215 | { | 215 | { |
216 | |||
217 | foreach (RegionCommsListener listener in m_regionListeners.Values) | ||
218 | { | ||
219 | listener.TriggerRegionUp(region); | ||
220 | } | ||
216 | 221 | ||
217 | return false; | 222 | return true; |
218 | } | 223 | } |
219 | 224 | ||
220 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) | 225 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) |