aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-21 16:58:14 +0000
committerJustin Clarke Casey2008-09-21 16:58:14 +0000
commit1a71a3a56776bc1d91f9da031a295fd4a0023e87 (patch)
tree2ba99a3fa223499313d3cc9c199c042859af148d /OpenSim/Region/Environment
parentDon't attach attachements to child agents. This coincidentially fixes a race (diff)
downloadopensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.zip
opensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.tar.gz
opensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.tar.bz2
opensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.tar.xz
* Fix http://opensimulator.org/mantis/view.php?id=2189
* Allow a grid mode region simulator to properly shutdown even if the grid service is offline
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 887a8da..c95068b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -135,7 +135,18 @@ namespace OpenSim.Region.Environment.Scenes
135 regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing; 135 regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
136 regionCommsHost.OnCloseAgentConnection -= CloseConnection; 136 regionCommsHost.OnCloseAgentConnection -= CloseConnection;
137 regionCommsHost.OnGetLandData -= FetchLandData; 137 regionCommsHost.OnGetLandData -= FetchLandData;
138 m_commsProvider.GridService.DeregisterRegion(m_regionInfo); 138
139 try
140 {
141 m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
142 }
143 catch (Exception e)
144 {
145 m_log.ErrorFormat(
146 "[GRID]: Deregistration of region {0} from the grid failed - {1}. Continuing",
147 m_regionInfo.RegionName, e);
148 }
149
139 regionCommsHost = null; 150 regionCommsHost = null;
140 } 151 }
141 } 152 }