diff options
author | Diva Canto | 2010-06-29 06:37:39 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |
parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
parent | This file wants to be committed. (diff) | |
download | opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/AgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 8 |
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 | ||