aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2010-06-30 21:26:43 +0100
committerMelanie2010-06-30 21:26:43 +0100
commitdd579cf615c67c70af77dbcf5064bb164c7410c5 (patch)
tree09b5baef28d6b8263184a5ae33ab2b2233c19fb1 /OpenSim/Server
parentFix scripts in rezzed objects not starting (Mantis #4775) (diff)
parentRemoved opportunity for exception in BaseHttpServer. (mantis #4825) (diff)
downloadopensim-SC-dd579cf615c67c70af77dbcf5064bb164c7410c5.zip
opensim-SC-dd579cf615c67c70af77dbcf5064bb164c7410c5.tar.gz
opensim-SC-dd579cf615c67c70af77dbcf5064bb164c7410c5.tar.bz2
opensim-SC-dd579cf615c67c70af77dbcf5064bb164c7410c5.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index bc31815..d261678 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -283,6 +283,10 @@ namespace OpenSim.Server.Handlers.Simulation
283 if (m_SimulationService == null) 283 if (m_SimulationService == null)
284 { 284 {
285 m_log.Debug("[AGENT HANDLER]: Agent GET called. Harmless but useless."); 285 m_log.Debug("[AGENT HANDLER]: Agent GET called. Harmless but useless.");
286 responsedata["content_type"] = "application/json";
287 responsedata["int_response_code"] = HttpStatusCode.NotImplemented;
288 responsedata["str_response_string"] = string.Empty;
289
286 return; 290 return;
287 } 291 }
288 292