summaryrefslogtreecommitdiff
path: root/indra/lib
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2008-04-08 21:04:41 +0000
committerLeyla Farazha <leyla@lindenlab.com>2008-04-08 21:04:41 +0000
commitb73ad517841cb428a395a6f49376d3bdc8e50f7e (patch)
tree3f69c38d1f540e5e97a537683369229ac6a77014 /indra/lib
parentf5e386527c4a74e6e5733f4f1cfa55873851257e (diff)
svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9
QAR-431
Diffstat (limited to 'indra/lib')
-rw-r--r--indra/lib/python/indra/ipc/llsdhttp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lib/python/indra/ipc/llsdhttp.py b/indra/lib/python/indra/ipc/llsdhttp.py
index eb9247da93..0561cfd520 100644
--- a/indra/lib/python/indra/ipc/llsdhttp.py
+++ b/indra/lib/python/indra/ipc/llsdhttp.py
@@ -34,7 +34,7 @@ from indra.base import llsd
from eventlet import httpc
-suite = httpc.HttpSuite(llsd.format_xml, llsd.parse, 'application/xml+llsd')
+suite = httpc.HttpSuite(llsd.format_xml, llsd.parse, 'application/llsd+xml')
delete = suite.delete
delete_ = suite.delete_
get = suite.get