diff options
author | Melanie | 2013-03-03 13:24:37 +0000 |
---|---|---|
committer | Melanie | 2013-03-03 13:24:37 +0000 |
commit | f39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch) | |
tree | a5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/ClientStack/Linden/Caps | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Make Keyframe motion cross regions again (diff) | |
download | opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2 opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
3 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 9b945f4..eadca9b 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -342,6 +342,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
342 | m_log.DebugFormat( | 342 | m_log.DebugFormat( |
343 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | 343 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); |
344 | 344 | ||
345 | if (!m_HostCapsObj.WaitForActivation()) | ||
346 | return string.Empty; | ||
347 | |||
345 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 348 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
346 | { | 349 | { |
347 | m_log.WarnFormat( | 350 | m_log.WarnFormat( |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 986a665..f6e501d 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -467,8 +467,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
467 | responsedata["content_type"] = "text/plain"; | 467 | responsedata["content_type"] = "text/plain"; |
468 | responsedata["keepalive"] = false; | 468 | responsedata["keepalive"] = false; |
469 | responsedata["reusecontext"] = false; | 469 | responsedata["reusecontext"] = false; |
470 | responsedata["str_response_string"] = "Upstream error: "; | 470 | responsedata["str_response_string"] = "<llsd></llsd>"; |
471 | responsedata["error_status_text"] = "Upstream error:"; | 471 | responsedata["error_status_text"] = "<llsd></llsd>"; |
472 | responsedata["http_protocol_version"] = "HTTP/1.0"; | 472 | responsedata["http_protocol_version"] = "HTTP/1.0"; |
473 | return responsedata; | 473 | return responsedata; |
474 | } | 474 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index a823dd8..707cc93 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -211,6 +211,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
211 | m_log.Error("Request: " + request); | 211 | m_log.Error("Request: " + request); |
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | catch (System.Xml.XmlException) | ||
215 | { | ||
216 | m_log.ErrorFormat("[INVENTORY]: XML Format error"); | ||
217 | } | ||
214 | 218 | ||
215 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | 219 | ArrayList foldersrequested = (ArrayList)hash["folders"]; |
216 | 220 | ||