aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2013-02-24 18:31:49 +0100
committerMelanie2013-02-24 18:31:49 +0100
commite0e9118f8137ec95c73fe264f0c3fcf9f7305741 (patch)
tree9ae124bf4d774c6c5ed846cd70602bbc84180e53 /OpenSim
parentRevert "Allow TeleportCancel packets to reset the transfer state machine" (diff)
downloadopensim-SC-e0e9118f8137ec95c73fe264f0c3fcf9f7305741.zip
opensim-SC-e0e9118f8137ec95c73fe264f0c3fcf9f7305741.tar.gz
opensim-SC-e0e9118f8137ec95c73fe264f0c3fcf9f7305741.tar.bz2
opensim-SC-e0e9118f8137ec95c73fe264f0c3fcf9f7305741.tar.xz
The viewer tries to parse the error message body to LLSD - give it some.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs4
1 files changed, 2 insertions, 2 deletions
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 }