diff options
author | Diva Canto | 2010-01-13 21:32:48 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-13 21:32:48 -0800 |
commit | e90a5895ada61aab7fc27ab6f67b13a20676e07b (patch) | |
tree | 1413874b6f5e0129ed485ad2918f85da35793b02 /OpenSim/Region/CoreModules | |
parent | * Added the missing AvatarServices module. (diff) | |
download | opensim-SC_OLD-e90a5895ada61aab7fc27ab6f67b13a20676e07b.zip opensim-SC_OLD-e90a5895ada61aab7fc27ab6f67b13a20676e07b.tar.gz opensim-SC_OLD-e90a5895ada61aab7fc27ab6f67b13a20676e07b.tar.bz2 opensim-SC_OLD-e90a5895ada61aab7fc27ab6f67b13a20676e07b.tar.xz |
Bug fix in releasing agent. In Scene, always use SimulatonService, and not m_SimulationService, because it may be null...
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 723973c..a341f2f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
251 | return s.IncomingReleaseAgent(id); | 251 | return s.IncomingReleaseAgent(id); |
252 | } | 252 | } |
253 | } | 253 | } |
254 | //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent"); | 254 | //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent " + origin); |
255 | return false; | 255 | return false; |
256 | } | 256 | } |
257 | 257 | ||
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
262 | 262 | ||
263 | foreach (Scene s in m_sceneList) | 263 | foreach (Scene s in m_sceneList) |
264 | { | 264 | { |
265 | if (s.RegionInfo.RegionHandle == destination.RegionHandle) | 265 | if (s.RegionInfo.RegionID == destination.RegionID) |
266 | { | 266 | { |
267 | //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent"); | 267 | //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent"); |
268 | return s.IncomingCloseAgent(id); | 268 | return s.IncomingCloseAgent(id); |