Second Life viewer sources 1.20.2

3 files changed, 21 insertions, 24 deletions

diff --git a/linden/indra/lib/python/indra/base/llsd.py b/linden/indra/lib/python/indra/base/llsd.py
index 71282bc..26ac3a2 100644
--- a/linden/indra/lib/python/indra/base/llsd.py
+++ b/linden/indra/lib/python/indra/base/llsd.py
@@ -842,16 +842,6 @@ try:
 except:
     print "Couldn't import mulib.stacked, not registering LLSD converters"
 else:
-    def llsd_convert_json(llsd_stuff, request):
-        callback = request.get_header('callback')
-        if callback is not None:
-            ## See Yahoo's ajax documentation for information about using this
-            ## callback style of programming
-            ## http://developer.yahoo.com/common/json.html#callbackparam
-            req.write("%s(%s)" % (callback, simplejson.dumps(llsd_stuff)))
-        else:
-            req.write(simplejson.dumps(llsd_stuff))
-
     def llsd_convert_xml(llsd_stuff, request):
         request.write(format_xml(llsd_stuff))
 
@@ -859,8 +849,6 @@ else:
         request.write(format_binary(llsd_stuff))
 
     for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
-        stacked.add_producer(typ, llsd_convert_json, 'application/json')
-
         stacked.add_producer(typ, llsd_convert_xml, 'application/llsd+xml')
         stacked.add_producer(typ, llsd_convert_xml, 'application/xml')
         stacked.add_producer(typ, llsd_convert_xml, 'text/xml')
diff --git a/linden/indra/lib/python/indra/ipc/llsdhttp.py b/linden/indra/lib/python/indra/ipc/llsdhttp.py
index 1bb335e..378c1c2 100644
--- a/linden/indra/lib/python/indra/ipc/llsdhttp.py
+++ b/linden/indra/lib/python/indra/ipc/llsdhttp.py
@@ -34,45 +34,54 @@ from indra.base import llsd
 
 from eventlet import httpc
 
-
-get, put, delete, post = httpc.make_suite(
-    llsd.format_xml, llsd.parse, 'application/xml+llsd')
-
+suite = httpc.HttpSuite(llsd.format_xml, llsd.parse, 'application/xml+llsd')
+delete = suite.delete
+delete_ = suite.delete_
+get = suite.get
+get_ = suite.get_
+head = suite.head
+head_ = suite.head_
+post = suite.post
+post_ = suite.post_
+put = suite.put
+put_ = suite.put_
+request = suite.request
+request_ = suite.request_
 
 for x in (httpc.ConnectionError, httpc.NotFound, httpc.Forbidden):
     globals()[x.__name__] = x
 
 
-def postFile(url, filename, verbose=False):
+def postFile(url, filename):
     f = open(filename)
     body = f.read()
     f.close()
     llsd_body = llsd.parse(body)
-    return post(url, llsd_body, verbose=verbose)
+    return post_(url, llsd_body)
 
 
 def getStatus(url, use_proxy=False):
-    status, _headers, _body = get(url, use_proxy=use_proxy, verbose=True)
+    status, _headers, _body = get_(url, use_proxy=use_proxy)
     return status
 
 
 def putStatus(url, data):
-    status, _headers, _body = put(url, data, verbose=True)
+    status, _headers, _body = put_(url, data)
     return status
 
 
 def deleteStatus(url):
-    status, _headers, _body = delete(url, verbose=True)
+    status, _headers, _body = delete_(url)
     return status
 
 
 def postStatus(url, data):
-    status, _headers, _body = post(url, data, verbose=True)
+    status, _headers, _body = post_(url, data)
     return status
 
 
 def postFileStatus(url, filename):
-    status, _headers, body = postFile(url, filename, verbose=True)
+    status, _headers, body = postFile(url, filename)
     return status, body
 
 
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 1bd44ae..89c14e8 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -94,7 +94,7 @@ def get_channel(srctree):
     for p in paths:
         if os.path.exists(p):
             contents = open(p, 'r').read()
-            channel = re.search("LL_CHANNEL\s=\s\"([\w\s]+)\"", contents).group(1)
+            channel = re.search("LL_CHANNEL\s=\s\"(.+)\";\s*$", contents, flags = re.M).group(1)
             return channel