aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-13 21:32:48 -0800
committerDiva Canto2010-01-13 21:32:48 -0800
commite90a5895ada61aab7fc27ab6f67b13a20676e07b (patch)
tree1413874b6f5e0129ed485ad2918f85da35793b02
parent* Added the missing AvatarServices module. (diff)
downloadopensim-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...
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs14
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
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);
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>
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
59 59
60 public Hashtable Handler(Hashtable request) 60 public Hashtable Handler(Hashtable request)
61 { 61 {
62 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); 62 m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
63 63
64 //m_log.Debug("---------------------------"); 64 m_log.Debug("---------------------------");
65 //m_log.Debug(" >> uri=" + request["uri"]); 65 m_log.Debug(" >> uri=" + request["uri"]);
66 //m_log.Debug(" >> content-type=" + request["content-type"]); 66 m_log.Debug(" >> content-type=" + request["content-type"]);
67 //m_log.Debug(" >> http-method=" + request["http-method"]); 67 m_log.Debug(" >> http-method=" + request["http-method"]);
68 //m_log.Debug("---------------------------\n"); 68 m_log.Debug("---------------------------\n");
69 69
70 Hashtable responsedata = new Hashtable(); 70 Hashtable responsedata = new Hashtable();
71 responsedata["content_type"] = "text/html"; 71 responsedata["content_type"] = "text/html";
@@ -307,7 +307,7 @@ namespace OpenSim.Server.Handlers.Simulation
307 307
308 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) 308 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
309 { 309 {
310 //m_log.Debug(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle); 310 m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);
311 311
312 GridRegion destination = new GridRegion(); 312 GridRegion destination = new GridRegion();
313 destination.RegionID = regionID; 313 destination.RegionID = regionID;