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/Framework | |
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/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 2821be2..b27be80 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
@@ -283,7 +283,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
283 | m_scene.SimulationService.UpdateAgent(reg, agent); | 283 | m_scene.SimulationService.UpdateAgent(reg, agent); |
284 | 284 | ||
285 | m_log.DebugFormat( | 285 | m_log.DebugFormat( |
286 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", agentCircuit.CapsPath, avatar.UUID); | 286 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); |
287 | 287 | ||
288 | 288 | ||
289 | /// | 289 | /// |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ecbd7e3..48f0331 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3791,7 +3791,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3791 | public void SendReleaseAgent(UUID origin, UUID id, string uri) | 3791 | public void SendReleaseAgent(UUID origin, UUID id, string uri) |
3792 | { | 3792 | { |
3793 | //m_interregionCommsOut.SendReleaseAgent(regionHandle, id, uri); | 3793 | //m_interregionCommsOut.SendReleaseAgent(regionHandle, id, uri); |
3794 | m_simulationService.ReleaseAgent(origin, id, uri); | 3794 | SimulationService.ReleaseAgent(origin, id, uri); |
3795 | } | 3795 | } |
3796 | 3796 | ||
3797 | /// <summary> | 3797 | /// <summary> |