Bug fix in releasing agent. In Scene, always use SimulatonService, and not m_SimulationService, because it may be null...

4 files changed, 11 insertions, 11 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
                     return s.IncomingReleaseAgent(id);
                 }
             }
-            //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent");
+            //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent " + origin);
             return false;
         }
 
@@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
             foreach (Scene s in m_sceneList)
             {
-                if (s.RegionInfo.RegionHandle == destination.RegionHandle)
+                if (s.RegionInfo.RegionID == destination.RegionID)
                 {
                     //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
                     return s.IncomingCloseAgent(id);
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>
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index da9c015..0c098d9 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -59,13 +59,13 @@ namespace OpenSim.Server.Handlers.Simulation
 
         public Hashtable Handler(Hashtable request)
         {
-            //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
+            m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
 
-            //m_log.Debug("---------------------------");
-            //m_log.Debug(" >> uri=" + request["uri"]);
-            //m_log.Debug(" >> content-type=" + request["content-type"]);
-            //m_log.Debug(" >> http-method=" + request["http-method"]);
-            //m_log.Debug("---------------------------\n");
+            m_log.Debug("---------------------------");
+            m_log.Debug(" >> uri=" + request["uri"]);
+            m_log.Debug(" >> content-type=" + request["content-type"]);
+            m_log.Debug(" >> http-method=" + request["http-method"]);
+            m_log.Debug("---------------------------\n");
 
             Hashtable responsedata = new Hashtable();
             responsedata["content_type"] = "text/html";
@@ -307,7 +307,7 @@ namespace OpenSim.Server.Handlers.Simulation
 
         protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
         {
-            //m_log.Debug(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle);
+            m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);
 
             GridRegion destination = new GridRegion();
             destination.RegionID = regionID;