From e90a5895ada61aab7fc27ab6f67b13a20676e07b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 21:32:48 -0800
Subject: Bug fix in releasing agent. In Scene, always use SimulatonService,
 and not m_SimulationService, because it may be null...

---
 .../Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs    | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

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
                         m_scene.SimulationService.UpdateAgent(reg, agent);
 
                         m_log.DebugFormat(
-                            "[CAPS]: Sending new CAPS seed url {0} to client {1}", agentCircuit.CapsPath, avatar.UUID);
+                            "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);
 
 
                         ///
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
         public void SendReleaseAgent(UUID origin, UUID id, string uri)
         {
             //m_interregionCommsOut.SendReleaseAgent(regionHandle, id, uri);
-            m_simulationService.ReleaseAgent(origin, id, uri);
+            SimulationService.ReleaseAgent(origin, id, uri);
         }
 
         /// <summary>
-- 
cgit v1.1