aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-06-27 13:23:51 -0700
committerDiva Canto2010-06-27 13:23:51 -0700
commit3dbc7360498582278a9dad9eb899431d14e4e9cf (patch)
tree64e992ea3c1d289fadf8943e3c3f7789c42b19e5 /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-3dbc7360498582278a9dad9eb899431d14e4e9cf.zip
opensim-SC_OLD-3dbc7360498582278a9dad9eb899431d14e4e9cf.tar.gz
opensim-SC_OLD-3dbc7360498582278a9dad9eb899431d14e4e9cf.tar.bz2
opensim-SC_OLD-3dbc7360498582278a9dad9eb899431d14e4e9cf.tar.xz
Addresses mantis #4789. Not really a fix, because the event is harmless anyway. Just shouldn't happen normally.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 191acc9..bc31815 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -272,7 +272,7 @@ namespace OpenSim.Server.Handlers.Simulation
272 //responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); ??? instead 272 //responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); ??? instead
273 } 273 }
274 274
275 // subclasses cab override this 275 // subclasses can override this
276 protected virtual bool UpdateAgent(GridRegion destination, AgentData agent) 276 protected virtual bool UpdateAgent(GridRegion destination, AgentData agent)
277 { 277 {
278 return m_SimulationService.UpdateAgent(destination, agent); 278 return m_SimulationService.UpdateAgent(destination, agent);
@@ -280,6 +280,12 @@ namespace OpenSim.Server.Handlers.Simulation
280 280
281 protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID) 281 protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID)
282 { 282 {
283 if (m_SimulationService == null)
284 {
285 m_log.Debug("[AGENT HANDLER]: Agent GET called. Harmless but useless.");
286 return;
287 }
288
283 GridRegion destination = new GridRegion(); 289 GridRegion destination = new GridRegion();
284 destination.RegionID = regionID; 290 destination.RegionID = regionID;
285 291