93 files changed, 3677 insertions, 1674 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 48c1429..ac24d99 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -209,6 +209,7 @@ Matthew Dowd
 McCabe Maxsted
        VWR-1318
        VWR-7893
+        VWR-8689
 Michelle2 Zenovka
        VWR-2652
        VWR-2834
diff --git a/linden/etc/message.xml b/linden/etc/message.xml
index 80dc560..d833074 100644
--- a/linden/etc/message.xml
+++ b/linden/etc/message.xml
@@ -441,6 +441,30 @@
                                        <boolean>true</boolean>
                                </map>
                                
+                                <key>EnableSimulator</key>
+                                <map>
+                                        <key>flavor</key>
+                                        <string>llsd</string>
+                                        <key>trusted-sender</key>
+                                        <boolean>true</boolean>
+                                </map>
+                                
+                                <key>TeleportFinish</key>
+                                <map>
+                                        <key>flavor</key>
+                                        <string>llsd</string>
+                                        <key>trusted-sender</key>
+                                        <boolean>true</boolean>
+                                </map>
+                                
+                                <key>CrossedRegion</key>
+                                <map>
+                                        <key>flavor</key>
+                                        <string>llsd</string>
+                                        <key>trusted-sender</key>
+                                        <boolean>true</boolean>
+                                </map>
+                                
                                <!-- UDPDeprecated Messages -->
                                <key>ScriptRunningReply</key>
                                <map>
@@ -564,6 +588,18 @@
                        <boolean>true</boolean>
                
                        <key>FetchInventoryDescendents</key>
+                        <boolean>false</boolean>
+                
+                        <key>WebFetchInventoryDescendents</key>
+                        <boolean>true</boolean>
+                
+                        <key>FetchInventory</key>
+                        <boolean>true</boolean>
+                
+                        <key>FetchLibDescendents</key>
+                        <boolean>true</boolean>
+                
+                        <key>FetchLib</key>
                        <boolean>true</boolean>
                </map>
diff --git a/linden/indra/lib/python/indra/base/llsd.py b/linden/indra/lib/python/indra/base/llsd.py
index 995ace7..e6141b6 100644
--- a/linden/indra/lib/python/indra/base/llsd.py
+++ b/linden/indra/lib/python/indra/base/llsd.py
@@ -33,19 +33,29 @@ import time
 import types
 import re
-from indra.util.fastest_elementtree import fromstring
+from indra.util.fastest_elementtree import ElementTreeError, fromstring
 from indra.base import lluuid
-int_regex = re.compile("[-+]?\d+")
+# cllsd.c in server/server-1.25 has memory leaks,
-real_regex = re.compile("[-+]?(\d+(\.\d*)?|\d*\.\d+)([eE][-+]?\d+)?")
+#   so disabling cllsd for now
-alpha_regex = re.compile("[a-zA-Z]+")
+#try:
-date_regex = re.compile("(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})T(?P<hour>\d{2}):(?P<minute>\d{2}):(?P<second>\d{2})(?P<second_float>\.\d{2})?Z")
+#    import cllsd
-#date: d"YYYY-MM-DDTHH:MM:SS.FFZ"
+#except ImportError:
+#    cllsd = None
+cllsd = None
+int_regex = re.compile(r"[-+]?\d+")
+real_regex = re.compile(r"[-+]?(\d+(\.\d*)?|\d*\.\d+)([eE][-+]?\d+)?")
+alpha_regex = re.compile(r"[a-zA-Z]+")
+date_regex = re.compile(r"(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})T"
+                        r"(?P<hour>\d{2}):(?P<minute>\d{2}):(?P<second>\d{2})"
+                        r"(?P<second_float>(\.\d+)?)Z")
+#date: d"YYYY-MM-DDTHH:MM:SS.FFFFFFZ"
 class LLSDParseError(Exception):
    pass
-class LLSDSerializationError(Exception):
+class LLSDSerializationError(TypeError):
    pass
@@ -62,14 +72,7 @@ BOOL_FALSE = ('0', '0.0', 'false', '')
 def format_datestr(v):
    """ Formats a datetime object into the string format shared by xml and notation serializations."""
-    second_str = ""
+    return v.isoformat() + 'Z'
-    if v.microsecond > 0:
-        seconds = v.second + float(v.microsecond) / 1000000
-        second_str = "%05.2f" % seconds
-    else:
-        second_str = "%d" % v.second
-    return '%s%sZ' % (v.strftime('%Y-%m-%dT%H:%M:'), second_str)
 def parse_datestr(datestr):
    """Parses a datetime object from the string format shared by xml and notation serializations."""
@@ -89,7 +92,7 @@ def parse_datestr(datestr):
    seconds_float = match.group('second_float')
    microsecond = 0
    if seconds_float:
-        microsecond = int(seconds_float[1:]) * 10000
+        microsecond = int(float('0' + seconds_float) * 1e6)
    return datetime.datetime(year, month, day, hour, minute, second, microsecond)
@@ -116,7 +119,7 @@ def uuid_to_python(node):
    return lluuid.UUID(node.text)
 def str_to_python(node):
-    return unicode(node.text or '').encode('utf8', 'replace')
+    return node.text or ''
 def bin_to_python(node):
    return binary(base64.decodestring(node.text or ''))
@@ -126,6 +129,7 @@ def date_to_python(node):
    if not val:
        val = "1970-01-01T00:00:00Z"
    return parse_datestr(val)
+    
 def uri_to_python(node):
    val = node.text or ''
@@ -189,9 +193,13 @@ class LLSDXMLFormatter(object):
        if(contents is None or contents is ''):
            return "<%s />" % (name,)
        else:
+            if type(contents) is unicode:
+                contents = contents.encode('utf-8')
            return "<%s>%s</%s>" % (name, contents, name)
    def xml_esc(self, v):
+        if type(v) is unicode:
+            v = v.encode('utf-8')
        return v.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
    def LLSD(self, v):
@@ -237,9 +245,14 @@ class LLSDXMLFormatter(object):
            raise LLSDSerializationError("Cannot serialize unknown type: %s (%s)" % (
                t, something))
-    def format(self, something):
+    def _format(self, something):
        return '<?xml version="1.0" ?>' + self.elt("llsd", self.generate(something))
+    def format(self, something):
+        if cllsd:
+            return cllsd.llsd_to_xml(something)
+        return self._format(something)
 _g_xml_formatter = None
 def format_xml(something):
    global _g_xml_formatter
@@ -356,8 +369,10 @@ class LLSDNotationFormatter(object):
    def UUID(self, v):
        return "u%s" % v
    def BINARY(self, v):
-        raise LLSDSerializationError("binary notation not yet supported")
+        return 'b64"' + base64.encodestring(v) + '"'
    def STRING(self, v):
+        if isinstance(v, unicode):
+            v = v.encode('utf-8')
        return "'%s'" % v.replace("\\", "\\\\").replace("'", "\\'")
    def URI(self, v):
        return 'l"%s"' % str(v).replace("\\", "\\\\").replace('"', '\\"')
@@ -366,16 +381,24 @@ class LLSDNotationFormatter(object):
    def ARRAY(self, v):
        return "[%s]" % ','.join([self.generate(item) for item in v])
    def MAP(self, v):
-        return "{%s}" % ','.join(["'%s':%s" % (key.replace("\\", "\\\\").replace("'", "\\'"), self.generate(value))
+        def fix(key):
+            if isinstance(key, unicode):
+                return key.encode('utf-8')
+            return key
+        return "{%s}" % ','.join(["'%s':%s" % (fix(key).replace("\\", "\\\\").replace("'", "\\'"), self.generate(value))
             for key, value in v.items()])
    def generate(self, something):
        t = type(something)
-        if self.type_map.has_key(t):
+        handler = self.type_map.get(t)
-            return self.type_map[t](something)
+        if handler:
+            return handler(something)
        else:
-            raise LLSDSerializationError("Cannot serialize unknown type: %s (%s)" % (
+            try:
-                t, something))
+                return self.ARRAY(iter(something))
+            except TypeError:
+                raise LLSDSerializationError(
+                    "Cannot serialize unknown type: %s (%s)" % (t, something))
    def format(self, something):
        return self.generate(something)
@@ -479,7 +502,6 @@ class LLSDBinaryParser(object):
                raise LLSDParseError("invalid map key at byte %d." % (
                    self._index - 1,))
            value = self._parse()
-            #print "kv:",key,value
            rv[key] = value
            count += 1
            cc = self._buffer[self._index]
@@ -636,11 +658,23 @@ class LLSDNotationParser(object):
            # 'd' = date in seconds since epoch
            return self._parse_date()
        elif cc == 'b':
-            raise LLSDParseError("binary notation not yet supported")
+            return self._parse_binary()
        else:
            raise LLSDParseError("invalid token at index %d: %d" % (
                self._index - 1, ord(cc)))
+    def _parse_binary(self):
+        i = self._index
+        if self._buffer[i:i+2] == '64':
+            q = self._buffer[i+2]
+            e = self._buffer.find(q, i+3)
+            try:
+                return base64.decodestring(self._buffer[i+3:e])
+            finally:
+                self._index = e + 1
+        else:
+            raise LLSDParseError('random horrible binary format not supported')
    def _parse_map(self):
        """ map: { string:object, string:object } """
        rv = {}
@@ -653,30 +687,23 @@ class LLSDNotationParser(object):
                if cc in ("'", '"', 's'):
                    key = self._parse_string(cc)
                    found_key = True
-                    #print "key:",key
                elif cc.isspace() or cc == ',':
                    cc = self._buffer[self._index]
                    self._index += 1
                else:
                    raise LLSDParseError("invalid map key at byte %d." % (
                                        self._index - 1,))
+            elif cc.isspace() or cc == ':':
+                cc = self._buffer[self._index]
+                self._index += 1
+                continue
            else:
-                if cc.isspace() or cc == ':':
-                    #print "skipping whitespace '%s'" % cc
-                    cc = self._buffer[self._index]
-                    self._index += 1
-                    continue
                self._index += 1
                value = self._parse()
-                #print "kv:",key,value
                rv[key] = value
                found_key = False
                cc = self._buffer[self._index]
                self._index += 1
-                #if cc == '}':
-                #    break
-                #cc = self._buffer[self._index]
-                #self._index += 1
        return rv
@@ -840,6 +867,14 @@ def format_binary(something):
    return '<?llsd/binary?>\n' + _format_binary_recurse(something)
 def _format_binary_recurse(something):
+    def _format_list(something):
+        array_builder = []
+        array_builder.append('[' + struct.pack('!i', len(something)))
+        for item in something:
+            array_builder.append(_format_binary_recurse(item))
+        array_builder.append(']')
+        return ''.join(array_builder)
    if something is None:
        return '!'
    elif isinstance(something, LLSD):
@@ -857,7 +892,10 @@ def _format_binary_recurse(something):
        return 'u' + something._bits
    elif isinstance(something, binary):
        return 'b' + struct.pack('!i', len(something)) + something
-    elif isinstance(something, (str, unicode)):
+    elif isinstance(something, str):
+        return 's' + struct.pack('!i', len(something)) + something
+    elif isinstance(something, unicode):
+        something = something.encode('utf-8')
        return 's' + struct.pack('!i', len(something)) + something
    elif isinstance(something, uri):
        return 'l' + struct.pack('!i', len(something)) + something
@@ -865,35 +903,50 @@ def _format_binary_recurse(something):
        seconds_since_epoch = time.mktime(something.timetuple())
        return 'd' + struct.pack('!d', seconds_since_epoch)
    elif isinstance(something, (list, tuple)):
-        array_builder = []
+        return _format_list(something)
-        array_builder.append('[' + struct.pack('!i', len(something)))
-        for item in something:
-            array_builder.append(_format_binary_recurse(item))
-        array_builder.append(']')
-        return ''.join(array_builder)
    elif isinstance(something, dict):
        map_builder = []
        map_builder.append('{' + struct.pack('!i', len(something)))
        for key, value in something.items():
+            if isinstance(key, unicode):
+                key = key.encode('utf-8')
            map_builder.append('k' + struct.pack('!i', len(key)) + key)
            map_builder.append(_format_binary_recurse(value))
        map_builder.append('}')
        return ''.join(map_builder)
    else:
-        raise LLSDSerializationError("Cannot serialize unknown type: %s (%s)" % (
+        try:
-            type(something), something))
+            return _format_list(list(something))
+        except TypeError:
+            raise LLSDSerializationError(
+                "Cannot serialize unknown type: %s (%s)" %
+                (type(something), something))
+def parse_binary(something):
+    header = '<?llsd/binary?>\n'
+    if not something.startswith(header):
+        raise LLSDParseError('LLSD binary encoding header not found')
+    return LLSDBinaryParser().parse(something[len(header):])
+    
+def parse_xml(something):
+    try:
+        return to_python(fromstring(something)[0])
+    except ElementTreeError, err:
+        raise LLSDParseError(*err.args)
+def parse_notation(something):
+    return LLSDNotationParser().parse(something)
 def parse(something):
    try:
        if something.startswith('<?llsd/binary?>'):
-            just_binary = something.split('\n', 1)[1]
+            return parse_binary(something)
-            return LLSDBinaryParser().parse(just_binary)
        # This should be better.
        elif something.startswith('<'):
-            return to_python(fromstring(something)[0])
+            return parse_xml(something)
        else:
-            return LLSDNotationParser().parse(something)
+            return parse_notation(something)
    except KeyError, e:
        raise Exception('LLSD could not be parsed: %s' % (e,))
@@ -913,6 +966,9 @@ class LLSD(object):
 undef = LLSD(None)
+XML_MIME_TYPE = 'application/llsd+xml'
+BINARY_MIME_TYPE = 'application/llsd+binary'
 # register converters for llsd in mulib, if it is available
 try:
    from mulib import stacked, mu
@@ -922,7 +978,7 @@ except:
    # mulib not available, don't print an error message since this is normal
    pass
 else:
-    mu.add_parser(parse, 'application/llsd+xml')
+    mu.add_parser(parse, XML_MIME_TYPE)
    mu.add_parser(parse, 'application/llsd+binary')
    def llsd_convert_xml(llsd_stuff, request):
@@ -931,11 +987,58 @@ else:
    def llsd_convert_binary(llsd_stuff, request):
        request.write(format_binary(llsd_stuff))
-    for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
+    for typ in [LLSD, dict, list, tuple, str, int, long, float, bool, unicode, type(None)]:
-        stacked.add_producer(typ, llsd_convert_xml, 'application/llsd+xml')
+        stacked.add_producer(typ, llsd_convert_xml, XML_MIME_TYPE)
        stacked.add_producer(typ, llsd_convert_xml, 'application/xml')
        stacked.add_producer(typ, llsd_convert_xml, 'text/xml')
        stacked.add_producer(typ, llsd_convert_binary, 'application/llsd+binary')
    stacked.add_producer(LLSD, llsd_convert_xml, '*/*')
+    # in case someone is using the legacy mu.xml wrapper, we need to
+    # tell mu to produce application/xml or application/llsd+xml
+    # (based on the accept header) from raw xml. Phoenix 2008-07-21
+    stacked.add_producer(mu.xml, mu.produce_raw, XML_MIME_TYPE)
+    stacked.add_producer(mu.xml, mu.produce_raw, 'application/xml')
+# mulib wsgi stuff
+# try:
+#     from mulib import mu, adapters
+#
+#     # try some known attributes from mulib to be ultra-sure we've imported it
+#     mu.get_current
+#     adapters.handlers
+# except:
+#     # mulib not available, don't print an error message since this is normal
+#     pass
+# else:
+#     def llsd_xml_handler(content_type):
+#         def handle_llsd_xml(env, start_response):
+#             llsd_stuff, _ = mu.get_current(env)
+#             result = format_xml(llsd_stuff)
+#             start_response("200 OK", [('Content-Type', content_type)])
+#             env['mu.negotiated_type'] = content_type
+#             yield result
+#         return handle_llsd_xml
+#    
+#     def llsd_binary_handler(content_type):
+#         def handle_llsd_binary(env, start_response):
+#             llsd_stuff, _ = mu.get_current(env)
+#             result = format_binary(llsd_stuff)
+#             start_response("200 OK", [('Content-Type', content_type)])
+#             env['mu.negotiated_type'] = content_type
+#             yield result
+#         return handle_llsd_binary
+#
+#     adapters.DEFAULT_PARSERS[XML_MIME_TYPE] = parse
+    
+#     for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
+#         for content_type in (XML_MIME_TYPE, 'application/xml'):
+#             adapters.handlers.set_handler(typ, llsd_xml_handler(content_type), content_type)
+#
+#         adapters.handlers.set_handler(typ, llsd_binary_handler(BINARY_MIME_TYPE), BINARY_MIME_TYPE)
+#
+#     adapters.handlers.set_handler(LLSD, llsd_xml_handler(XML_MIME_TYPE), '*/*')
diff --git a/linden/indra/lib/python/indra/ipc/llsdhttp.py b/linden/indra/lib/python/indra/ipc/llsdhttp.py
index 1cf1146..ed64899 100644
--- a/linden/indra/lib/python/indra/ipc/llsdhttp.py
+++ b/linden/indra/lib/python/indra/ipc/llsdhttp.py
@@ -51,6 +51,8 @@ request_ = suite.request_
 # import every httpc error exception into our namespace for convenience
 for x in httpc.status_to_error_map.itervalues():
    globals()[x.__name__] = x
+ConnectionError = httpc.ConnectionError
+Retriable = httpc.Retriable
 for x in (httpc.ConnectionError,):
    globals()[x.__name__] = x
diff --git a/linden/indra/lib/python/indra/ipc/mysql_pool.py b/linden/indra/lib/python/indra/ipc/mysql_pool.py
index 507b185..25a66cf 100644
--- a/linden/indra/lib/python/indra/ipc/mysql_pool.py
+++ b/linden/indra/lib/python/indra/ipc/mysql_pool.py
@@ -30,8 +30,10 @@ import MySQLdb
 from eventlet import db_pool
 class DatabaseConnector(db_pool.DatabaseConnector):
-    def __init__(self, credentials, min_size = 0, max_size = 4, *args, **kwargs):
+    def __init__(self, credentials, *args, **kwargs):
-        super(DatabaseConnector, self).__init__(MySQLdb, credentials, min_size, max_size, conn_pool=db_pool.ConnectionPool, *args, **kwargs)
+        super(DatabaseConnector, self).__init__(MySQLdb, credentials,
+                                                conn_pool=db_pool.ConnectionPool,
+                                                *args, **kwargs)
    # get is extended relative to eventlet.db_pool to accept a port argument
    def get(self, host, dbname, port=3306):
@@ -42,7 +44,7 @@ class DatabaseConnector(db_pool.DatabaseConnector):
            new_kwargs['host'] = host
            new_kwargs['port'] = port
            new_kwargs.update(self.credentials_for(host))
-            dbpool = ConnectionPool(self._min_size, self._max_size, *self._args, **new_kwargs)
+            dbpool = ConnectionPool(*self._args, **new_kwargs)
            self._databases[key] = dbpool
        return self._databases[key]
@@ -51,8 +53,8 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
    """A pool which gives out saranwrapped MySQLdb connections from a pool
    """
-    def __init__(self, min_size = 0, max_size = 4, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
-        super(ConnectionPool, self).__init__(MySQLdb, min_size, max_size, *args, **kwargs)
+        super(ConnectionPool, self).__init__(MySQLdb, *args, **kwargs)
    def get(self):
        conn = super(ConnectionPool, self).get()
@@ -77,14 +79,3 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
        conn.connection_parameters = converted_kwargs
        return conn
-    def clear(self):
-        """ Close all connections that this pool still holds a reference to, leaving it empty."""
-        for conn in self.free_items:
-            try:
-                conn.close()
-            except:
-                pass   # even if stuff happens here, we still want to at least try to close all the other connections
-        self.free_items.clear()
-            
-    def __del__(self):
-        self.clear()
diff --git a/linden/indra/lib/python/indra/ipc/servicebuilder.py b/linden/indra/lib/python/indra/ipc/servicebuilder.py
index 89cdfad..01f2c6f 100644
--- a/linden/indra/lib/python/indra/ipc/servicebuilder.py
+++ b/linden/indra/lib/python/indra/ipc/servicebuilder.py
@@ -51,12 +51,10 @@ def build(name, context={}, **kwargs):
     > servicebuilder.build('version-manager-version', context, version='1.18.1.2')
       'http://int.util.vaak.lindenlab.com/channel/Second%20Life%20Release/1.18.1.2'
    """
-    context = context.copy()  # shouldn't modify the caller's dictionary
-    context.update(kwargs)
    global _g_builder
    if _g_builder is None:
        _g_builder = ServiceBuilder()
-    return _g_builder.buildServiceURL(name, context)
+    return _g_builder.buildServiceURL(name, context, **kwargs)
 class ServiceBuilder(object):
    def __init__(self, services_definition = services_config):
@@ -81,13 +79,36 @@ class ServiceBuilder(object):
            else:
                self.builders[service['name']] = service_builder
-    def buildServiceURL(self, name, context):
+    def buildServiceURL(self, name, context={}, **kwargs):
        """\
        @brief given the environment on construction, return a service URL.
        @param name The name of the service.
        @param context A dict of name value lookups for the service.
+        @param kwargs Any keyword arguments are treated as members of the
+            context, this allows you to be all 31337 by writing shit like:
+            servicebuilder.build('name', param=value)
        @returns Returns the 
        """
+        context = context.copy()  # shouldn't modify the caller's dictionary
+        context.update(kwargs)
        base_url = config.get('services-base-url')
        svc_path = russ.format(self.builders[name], context)
        return base_url + svc_path
+def on_in(query_name, host_key, schema_key):
+    """\
+    @brief Constructs an on/in snippet (for running named queries)
+    from a schema name and two keys referencing values stored in
+    indra.xml.
+    @param query_name Name of the query.
+    @param host_key Logical name of destination host.  Will be
+        looked up in indra.xml.
+    @param schema_key Logical name of destination schema.  Will
+        be looked up in indra.xml.
+    """
+    host_name = config.get(host_key)
+    schema_name = config.get(schema_key)
+    return '/'.join( ('on', host_name, 'in', schema_name, query_name.lstrip('/')) )
diff --git a/linden/indra/lib/python/indra/ipc/siesta.py b/linden/indra/lib/python/indra/ipc/siesta.py
index 5fbea29..b206f18 100644
--- a/linden/indra/lib/python/indra/ipc/siesta.py
+++ b/linden/indra/lib/python/indra/ipc/siesta.py
@@ -24,9 +24,9 @@ except ImportError:
 llsd_parsers = {
    'application/json': json_decode,
-    'application/llsd+binary': llsd.parse_binary,
+    llsd.BINARY_MIME_TYPE: llsd.parse_binary,
    'application/llsd+notation': llsd.parse_notation,
-    'application/llsd+xml': llsd.parse_xml,
+    llsd.XML_MIME_TYPE: llsd.parse_xml,
    'application/xml': llsd.parse_xml,
    }
diff --git a/linden/indra/lib/python/indra/util/fastest_elementtree.py b/linden/indra/lib/python/indra/util/fastest_elementtree.py
index 64aed09..2470143 100644
--- a/linden/indra/lib/python/indra/util/fastest_elementtree.py
+++ b/linden/indra/lib/python/indra/util/fastest_elementtree.py
@@ -2,9 +2,9 @@
 @file fastest_elementtree.py
 @brief Concealing some gnarly import logic in here.  This should export the interface of elementtree.
-$LicenseInfo:firstyear=2006&license=mit$
+$LicenseInfo:firstyear=2008&license=mit$
-Copyright (c) 2006-2008, Linden Research, Inc.
+Copyright (c) 2008, Linden Research, Inc.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26,27 +26,40 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
-# Using celementree might cause some unforeseen problems so here's a
+# The parsing exception raised by the underlying library depends
+# on the ElementTree implementation we're using, so we provide an
+# alias here.
+#
+# Use ElementTreeError as the exception type for catching parsing
+# errors.
+# Using cElementTree might cause some unforeseen problems, so here's a
 # convenient off switch.
-# *NOTE: turned off cause of problems.  :-(  *TODO: debug
+use_celementree = True
-use_celementree = False
 try:
    if not use_celementree:
        raise ImportError()
-    from cElementTree import * ## This does not work under Windows
+    # Python 2.3 and 2.4.
+    from cElementTree import *
+    ElementTreeError = SyntaxError
 except ImportError:
    try:
        if not use_celementree:
            raise ImportError()
-        ## This is the name of cElementTree under python 2.5
+        # Python 2.5 and above.
        from xml.etree.cElementTree import *
+        ElementTreeError = SyntaxError
    except ImportError:
+        # Pure Python code.
        try:
-            ## This is the old name of elementtree, for use with 2.3
+            # Python 2.3 and 2.4.
            from elementtree.ElementTree import *
        except ImportError:
-            ## This is the name of elementtree under python 2.5
+            # Python 2.5 and above.
            from xml.etree.ElementTree import *
+        # The pure Python ElementTree module uses Expat for parsing.
+        from xml.parsers.expat import ExpatError as ElementTreeError
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 4675177..a00d242 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -584,7 +584,7 @@ class LLManifest(object):
    def wildcard_regex(self, src_glob, dst_glob):
        src_re = re.escape(src_glob)
-        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]+)')
+        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]*)')
        dst_temp = dst_glob
        i = 1
        while dst_temp.count("*") > 0:
@@ -621,6 +621,7 @@ class LLManifest(object):
            count = 0
            if self.wildcard_pattern.search(src):
                for s,d in self.expand_globs(src, dst):
+                    assert(s != d)
                    count += self.process_file(s, d)
            else:
                # if we're specifying a single path (not a glob),
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py
index 666cce4..fe9448f 100644
--- a/linden/indra/lib/python/indra/util/llversion.py
+++ b/linden/indra/lib/python/indra/util/llversion.py
@@ -50,7 +50,10 @@ def get_version(version_type):
    m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', file_str)
    VER_MINOR = m.group(1)
    m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', file_str)
-    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s" % locals()
+    VER_PATCH = m.group(1)
+    m = re.search('const S32 IMP_VERSION_TEST = (\d+);', file_str)
+    VER_BUILD = m.group(1)
+    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_TEST)s" % locals()
    return version
 def get_channel(version_type):
diff --git a/linden/indra/lib/python/indra/util/named_query.py b/linden/indra/lib/python/indra/util/named_query.py
index 20f2ec7..788fb0e 100644
--- a/linden/indra/lib/python/indra/util/named_query.py
+++ b/linden/indra/lib/python/indra/util/named_query.py
@@ -47,6 +47,8 @@ except NameError:
 from indra.base import llsd
 from indra.base import config
+DEBUG = False
 NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '.nq')
 NQ_FILE_SUFFIX_LEN  = len(NQ_FILE_SUFFIX)
@@ -63,7 +65,9 @@ def _init_g_named_manager(sql_dir = None):
    # extra fallback directory in case config doesn't return what we want
    if sql_dir is None:
-        sql_dir = os.path.dirname(__file__) + "../../../../web/dataservice/sql"
+        sql_dir = os.path.abspath(
+            os.path.join(
+            os.path.realpath(os.path.dirname(__file__)), "..", "..", "..", "..", "web", "dataservice", "sql"))
    global _g_named_manager
    _g_named_manager = NamedQueryManager(
@@ -103,11 +107,12 @@ class NamedQuery(object):
    def __init__(self, name, filename):
        """ Construct a NamedQuery object.  The name argument is an
        arbitrary name as a handle for the query, and the filename is
-        a path to a file containing an llsd named query document."""
+        a path to a file or a file-like object containing an llsd named
+        query document."""
        self._stat_interval_seconds = 5  # 5 seconds
        self._name = name
-        if (filename is not None) \
+        if (filename is not None and isinstance(filename, (str, unicode))
-                and (NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
+            and NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
            filename = filename + NQ_FILE_SUFFIX
        self._location = filename
        self._alternative = dict()
@@ -122,8 +127,8 @@ class NamedQuery(object):
    def get_modtime(self):
        """ Returns the mtime (last modified time) of the named query
-        file, if such exists."""
+        filename. For file-like objects, expect a modtime of 0"""
-        if self._location:
+        if self._location and isinstance(self._location, (str, unicode)):
            return os.path.getmtime(self._location)
        return 0
@@ -131,7 +136,12 @@ class NamedQuery(object):
        """ Loads and parses the named query file into self.  Does
        nothing if self.location is nonexistant."""
        if self._location:
-            self._reference_contents(llsd.parse(open(self._location).read()))
+            if isinstance(self._location, (str, unicode)):
+                contents = llsd.parse(open(self._location).read())
+            else:
+                # we probably have a file-like object. Godspeed!
+                contents = llsd.parse(self._location.read())
+            self._reference_contents(contents)
            # Check for alternative implementations
            try:
                for name, alt in self._contents['alternative'].items():
@@ -182,6 +192,16 @@ class NamedQuery(object):
        ready them for use in LIKE statements"""
        if sql:
            #print >>sys.stderr, "sql:",sql
+            
+            # This first sub is to properly escape any % signs that
+            # are meant to be literally passed through to mysql in the
+            # query.  It leaves any %'s that are used for
+            # like-expressions.
+            expr = re.compile("(?<=[^a-zA-Z0-9_-])%(?=[^:])")
+            sql = expr.sub('%%', sql)
+            # This should tackle the rest of the %'s in the query, by
+            # converting them to LIKE clauses.
            expr = re.compile("(%?):([a-zA-Z][a-zA-Z0-9_-]*)%")
            sql = expr.sub(self._prepare_like, sql)
            expr = re.compile("#:([a-zA-Z][a-zA-Z0-9_-]*)")
@@ -333,7 +353,8 @@ class NamedQuery(object):
            cursor = connection.cursor()
        
        statement = self.sql(connection, params)
-        #print "SQL:", statement
+        if DEBUG:
+            print "SQL:", statement
        rows = cursor.execute(statement)
        
        # *NOTE: the expect_rows argument is a very cheesy way to get some
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 1c48a5c..023676a 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -77,6 +77,14 @@ enum LAND_STAT_REPORT_TYPE
 const U32 STAT_FILTER_MASK      = 0x1FFFFFFF;
+// Region absolute limits
+static const S32                REGION_AGENT_COUNT_MIN = 1;
+static const S32                REGION_AGENT_COUNT_MAX = 200;                   // Must fit in U8 for the moment (RegionInfo msg)
+static const S32                REGION_PRIM_COUNT_MIN = 0;
+static const S32                REGION_PRIM_COUNT_MAX = 40000;
+static const F32                REGION_PRIM_BONUS_MIN = 1.0;
+static const F32                REGION_PRIM_BONUS_MAX = 10.0;
 // Default maximum number of tasks/prims per region.
 const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
@@ -229,10 +237,11 @@ const S32 KEY_COUNT = 256;
 const F32 DEFAULT_WATER_HEIGHT  = 20.0f;
 // Maturity ratings for simulators
-const U8 SIM_ACCESS_MIN         = 0;
+const U8 SIM_ACCESS_MIN         = 0;            // Treated as 'unknown', usually ends up being SIM_ACCESS_PG
 const U8 SIM_ACCESS_TRIAL       = 7;
 const U8 SIM_ACCESS_PG          = 13;
 const U8 SIM_ACCESS_MATURE      = 21;
+const U8 SIM_ACCESS_ADULT       = 42;           // Seriously Adult Only
 const U8 SIM_ACCESS_DOWN        = 254;
 const U8 SIM_ACCESS_MAX         = SIM_ACCESS_MATURE;
@@ -251,6 +260,7 @@ const U8 GOD_NOT = 0;
 const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 // Governor Linden's agent id.
+const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f");
 const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
 const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
 // Maintenance's group id.
diff --git a/linden/indra/llcommon/llkeythrottle.h b/linden/indra/llcommon/llkeythrottle.h
index eb1519a..25d0fe0 100644
--- a/linden/indra/llcommon/llkeythrottle.h
+++ b/linden/indra/llcommon/llkeythrottle.h
@@ -243,7 +243,7 @@ public:
        }
        // Set the throttling behavior
-        void setParameters( U32 limit, F32 interval, BOOL realtime )
+        void setParameters( U32 limit, F32 interval, BOOL realtime = TRUE )
        {
                // limit is the maximum number of keys
                // allowed per interval (in seconds or frames)
diff --git a/linden/indra/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp
index 4b79fcb..706acdb 100644
--- a/linden/indra/llcommon/llstat.cpp
+++ b/linden/indra/llcommon/llstat.cpp
@@ -31,55 +31,288 @@
 #include "linden_common.h"
 #include "llstat.h"
+#include "lllivefile.h"
+#include "llerrorcontrol.h"
 #include "llframetimer.h"
 #include "timing.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "llstl.h"
+#include "u64.h"
-class LLStatAccum::impl
+// statics
+BOOL            LLPerfBlock::sStatsEnabled = FALSE;    // Flag for detailed information
+LLPerfBlock::stat_map_t    LLPerfBlock::sStatMap;    // Map full path string to LLStatTime objects, tracks all active objects
+std::string        LLPerfBlock::sCurrentStatPath = "";    // Something like "/total_time/physics/physics step"
+//------------------------------------------------------------------------
+// Live config file to trigger stats logging
+static const char    STATS_CONFIG_FILE_NAME[]            = "/dev/shm/simperf/simperf_proc_config.llsd";
+static const F32    STATS_CONFIG_REFRESH_RATE            = 5.0;        // seconds
+class LLStatsConfigFile : public LLLiveFile
 {
 public:
-        static const TimeScale IMPL_NUM_SCALES = (TimeScale)(SCALE_TWO_MINUTE + 1);
+    LLStatsConfigFile()
-        static U64 sScaleTimes[IMPL_NUM_SCALES];
+        : LLLiveFile(filename(), STATS_CONFIG_REFRESH_RATE),
+        mChanged(false), mStatsp(NULL) { }
-        BOOL    mUseFrameTimer;
+    static std::string filename();
+    
+protected:
+    /* virtual */ void loadFile();
-        BOOL    mRunning;
+public:
-        U64             mLastTime;
+    void init(LLPerfStats* statsp);
-        
+    static LLStatsConfigFile& instance();
-        struct Bucket
+        // return the singleton stats config file
-        {
-                F64             accum;
-                U64             endTime;
-                BOOL    lastValid;
+    bool mChanged;
-                F64             lastAccum;
-        };
-        Bucket  mBuckets[IMPL_NUM_SCALES];
+protected:
+    LLPerfStats*    mStatsp;
+};
-        BOOL    mLastSampleValid;
+std::string LLStatsConfigFile::filename()
-        F64     mLastSampleValue;
+{
+    return STATS_CONFIG_FILE_NAME;
+}
+void LLStatsConfigFile::init(LLPerfStats* statsp)
+{
+    mStatsp = statsp;
+}
-        impl(bool useFrameTimer);
+LLStatsConfigFile& LLStatsConfigFile::instance()
+{
+    static LLStatsConfigFile the_file;
+    return the_file;
+}
-        void reset(U64 when);
-        void sum(F64 value);
+/* virtual */
-        void sum(F64 value, U64 when);
+// Load and parse the stats configuration file
+void LLStatsConfigFile::loadFile()
+{
+    if (!mStatsp)
+    {
+        llwarns << "Tries to load performance configure file without initializing LPerfStats" << llendl;
+        return;
+    }
+    mChanged = true;
+    
+    LLSD stats_config;
+    {
+        llifstream file(filename().c_str());
+        if (file.is_open())
+        {
+            LLSDSerialize::fromXML(stats_config, file);
+            if (stats_config.isUndefined())
+            {
+                llinfos << "Performance statistics configuration file ill-formed, not recording statistics" << llendl;
+                mStatsp->setReportPerformanceDuration( 0.f );
+                return;
+            }
+        }
+        else 
+        {    // File went away, turn off stats if it was on
+            if ( mStatsp->frameStatsIsRunning() )
+            {
+                llinfos << "Performance statistics configuration file deleted, not recording statistics" << llendl;
+                mStatsp->setReportPerformanceDuration( 0.f );
+            }
+            return;
+        }
+    }
+    F32 duration = 0.f;
+    F32 interval = 0.f;
+    const char * w = "duration";
+    if (stats_config.has(w))
+    {
+        duration = (F32)stats_config[w].asReal();
+    } 
+    w = "interval";
+    if (stats_config.has(w))
+    {
+        interval = (F32)stats_config[w].asReal();
+    } 
+    mStatsp->setReportPerformanceDuration( duration );
+    mStatsp->setReportPerformanceInterval( interval );
+    if ( duration > 0 )
+    {
+        if ( interval == 0.f )
+        {
+            llinfos << "Recording performance stats every frame for " << duration << " sec" << llendl;
+        }
+        else
+        {
+            llinfos << "Recording performance stats every " << interval << " seconds for " << duration << " seconds" << llendl;
+        }
+    }
+    else
+    {
+        llinfos << "Performance stats recording turned off" << llendl;
+    }
+}
-        F32 meanValue(TimeScale scale) const;
-        U64 getCurrentUsecs() const;
+//------------------------------------------------------------------------
-                // Get current microseconds based on timer type
-};
+LLPerfStats::LLPerfStats(const std::string& process_name, S32 process_pid) : 
+    mFrameStatsFileFailure(FALSE),
+    mSkipFirstFrameStats(FALSE),
+    mProcessName(process_name),
+    mProcessPID(process_pid),
+    mReportPerformanceStatInterval(1.f),
+    mReportPerformanceStatEnd(0.0) 
+{ }
-U64 LLStatAccum::impl::sScaleTimes[IMPL_NUM_SCALES] =
+LLPerfStats::~LLPerfStats()
+{
+    LLPerfBlock::clearDynamicStats();
+    mFrameStatsFile.close();
+}
+void LLPerfStats::init()
+{
+    // Initialize the stats config file instance.
+    (void) LLStatsConfigFile::instance().init(this);
+    (void) LLStatsConfigFile::instance().checkAndReload();
+}
+// Open file for statistics
+void    LLPerfStats::openPerfStatsFile()
+{
+    if ( !mFrameStatsFile
+        && !mFrameStatsFileFailure )
+    {
+        std::string stats_file = llformat("/dev/shm/simperf/%s_proc.%d.llsd", mProcessName.c_str(), mProcessPID);
+        mFrameStatsFile.close();
+        mFrameStatsFile.clear();
+        mFrameStatsFile.open(stats_file, llofstream::out);
+        if ( mFrameStatsFile.fail() )
+        {
+            llinfos << "Error opening statistics log file " << stats_file << llendl;
+            mFrameStatsFileFailure = TRUE;
+        }
+        else
+        {
+            LLSD process_info = LLSD::emptyMap();
+            process_info["name"] = mProcessName;
+            process_info["pid"] = (LLSD::Integer) mProcessPID;
+            process_info["stat_rate"] = (LLSD::Integer) mReportPerformanceStatInterval;
+            // Add process-specific info.
+            addProcessHeaderInfo(process_info);
+            mFrameStatsFile << LLSDNotationStreamer(process_info) << std::endl; 
+        }
+    }
+}
+// Dump out performance metrics over some time interval
+void LLPerfStats::dumpIntervalPerformanceStats()
+{
+    // Ensure output file is OK
+    openPerfStatsFile();
+    if ( mFrameStatsFile )
+    {
+        LLSD stats = LLSD::emptyMap();
+        LLStatAccum::TimeScale scale;
+        if ( getReportPerformanceInterval() == 0.f )
+        {
+            scale = LLStatAccum::SCALE_PER_FRAME;
+        }
+        else if ( getReportPerformanceInterval() < 0.5f )
+        {
+            scale = LLStatAccum::SCALE_100MS;
+        }
+        else
+        {
+            scale = LLStatAccum::SCALE_SECOND;
+        }
+        // Write LLSD into log
+        stats["utc_time"] = (LLSD::String) LLError::utcTime();
+        stats["timestamp"] = U64_to_str((totalTime() / 1000) + (gUTCOffset * 1000));    // milliseconds since epoch
+        stats["frame_number"] = (LLSD::Integer) LLFrameTimer::getFrameCount();
+        // Add process-specific frame info.
+        addProcessFrameInfo(stats, scale);
+        LLPerfBlock::addStatsToLLSDandReset( stats, scale );
+        mFrameStatsFile << LLSDNotationStreamer(stats) << std::endl; 
+    }
+}
+// Set length of performance stat recording
+void    LLPerfStats::setReportPerformanceDuration( F32 seconds )
+{ 
+        if ( seconds <= 0.f )
+        {
+                mReportPerformanceStatEnd = 0.0;
+                LLPerfBlock::setStatsEnabled( FALSE );
+                mFrameStatsFile.close();
+                LLPerfBlock::clearDynamicStats();
+        }
+        else
+        {
+                mReportPerformanceStatEnd = LLFrameTimer::getElapsedSeconds() + ((F64) seconds);
+                // Clear failure flag to try and create the log file once
+                mFrameStatsFileFailure = FALSE;
+                LLPerfBlock::setStatsEnabled( TRUE );
+                mSkipFirstFrameStats = TRUE;            // Skip the first report (at the end of this frame)
+        }
+}
+void LLPerfStats::updatePerFrameStats()
+{
+    (void) LLStatsConfigFile::instance().checkAndReload();
+        static LLFrameTimer performance_stats_timer;
+        if ( frameStatsIsRunning() )
+        {
+                if ( mReportPerformanceStatInterval == 0 )
+                {       // Record info every frame
+                        if ( mSkipFirstFrameStats )
+                        {       // Skip the first time - was started this frame
+                                mSkipFirstFrameStats = FALSE;
+                        }
+                        else
+                        {
+                                dumpIntervalPerformanceStats();
+                        }
+                }
+                else
+                {
+                        performance_stats_timer.setTimerExpirySec( getReportPerformanceInterval() );
+                        if (performance_stats_timer.checkExpirationAndReset( mReportPerformanceStatInterval ))
+                        {
+                                dumpIntervalPerformanceStats();
+                        }
+                }
+                
+                if ( LLFrameTimer::getElapsedSeconds() > mReportPerformanceStatEnd )
+                {       // Reached end of time, clear it to stop reporting
+                        setReportPerformanceDuration(0.f);                      // Don't set mReportPerformanceStatEnd directly 
+            llinfos << "Recording performance stats completed" << llendl;
+                }
+        }
+}
+//------------------------------------------------------------------------
+U64 LLStatAccum::sScaleTimes[NUM_SCALES] =
 {
        USEC_PER_SEC / 10,                              // 100 millisec
        USEC_PER_SEC * 1,                               // seconds
        USEC_PER_SEC * 60,                              // minutes
-        USEC_PER_SEC * 60 * 2                   // two minutes
 #if ENABLE_LONG_TIME_STATS
        // enable these when more time scales are desired
        USEC_PER_SEC * 60*60,                   // hours
@@ -89,19 +322,27 @@ U64 LLStatAccum::impl::sScaleTimes[IMPL_NUM_SCALES] =
 };
-LLStatAccum::impl::impl(bool useFrameTimer)
+LLStatAccum::LLStatAccum(bool useFrameTimer)
+        : mUseFrameTimer(useFrameTimer),
+          mRunning(FALSE),
+          mLastSampleValue(0.0),
+          mLastSampleValid(FALSE)
+{
+}
+LLStatAccum::~LLStatAccum()
 {
-        mUseFrameTimer = useFrameTimer;
-        mRunning = FALSE;
-        mLastSampleValid = FALSE;
 }
-void LLStatAccum::impl::reset(U64 when)
+void LLStatAccum::reset(U64 when)
 {
        mRunning = TRUE;
        mLastTime = when;
-        for (int i = 0; i < IMPL_NUM_SCALES; ++i)
+        for (int i = 0; i < NUM_SCALES; ++i)
        {
                mBuckets[i].accum = 0.0;
                mBuckets[i].endTime = when + sScaleTimes[i];
@@ -109,12 +350,12 @@ void LLStatAccum::impl::reset(U64 when)
        }
 }
-void LLStatAccum::impl::sum(F64 value)
+void LLStatAccum::sum(F64 value)
 {
        sum(value, getCurrentUsecs());
 }
-void LLStatAccum::impl::sum(F64 value, U64 when)
+void LLStatAccum::sum(F64 value, U64 when)
 {
        if (!mRunning)
        {
@@ -131,7 +372,10 @@ void LLStatAccum::impl::sum(F64 value, U64 when)
                return;
        }
-        for (int i = 0; i < IMPL_NUM_SCALES; ++i)
+        // how long is this value for
+        U64 timeSpan = when - mLastTime;
+        for (int i = 0; i < NUM_SCALES; ++i)
        {
                Bucket& bucket = mBuckets[i];
@@ -143,8 +387,6 @@ void LLStatAccum::impl::sum(F64 value, U64 when)
                {
                        U64 timeScale = sScaleTimes[i];
-                        U64 timeSpan = when - mLastTime;
-                                // how long is this value for
                        U64 timeLeft = when - bucket.endTime;
                                // how much time is left after filling this bucket
                        
@@ -173,13 +415,18 @@ void LLStatAccum::impl::sum(F64 value, U64 when)
 }
-F32 LLStatAccum::impl::meanValue(TimeScale scale) const
+F32 LLStatAccum::meanValue(TimeScale scale) const
 {
        if (!mRunning)
        {
                return 0.0;
        }
-        if (scale < 0 || scale >= IMPL_NUM_SCALES)
+        if ( scale == SCALE_PER_FRAME )
+        {       // Per-frame not supported here
+                scale = SCALE_100MS;
+        }
+        if (scale < 0 || scale >= NUM_SCALES)
        {
                llwarns << "llStatAccum::meanValue called for unsupported scale: "
                        << scale << llendl;
@@ -209,7 +456,7 @@ F32 LLStatAccum::impl::meanValue(TimeScale scale) const
 }
-U64 LLStatAccum::impl::getCurrentUsecs() const
+U64 LLStatAccum::getCurrentUsecs() const
 {
        if (mUseFrameTimer)
        {
@@ -222,25 +469,44 @@ U64 LLStatAccum::impl::getCurrentUsecs() const
 }
+// ------------------------------------------------------------------------
+LLStatRate::LLStatRate(bool use_frame_timer)
+        : LLStatAccum(use_frame_timer)
-LLStatAccum::LLStatAccum(bool useFrameTimer)
-        : m(* new impl(useFrameTimer))
 {
 }
-LLStatAccum::~LLStatAccum()
+void LLStatRate::count(U32 value)
 {
-        delete &m;
+        sum((F64)value * sScaleTimes[SCALE_SECOND]);
 }
-F32 LLStatAccum::meanValue(TimeScale scale) const
-{
+void LLStatRate::mark()
-        return m.meanValue(scale);
+ { 
-}
+        // Effectively the same as count(1), but sets mLastSampleValue
+        U64 when = getCurrentUsecs();
+        if ( mRunning 
+                 && (when > mLastTime) )
+        {       // Set mLastSampleValue to the time from the last mark()
+                F64 duration = ((F64)(when - mLastTime)) / sScaleTimes[SCALE_SECOND];
+                if ( duration > 0.0 )
+                {
+                        mLastSampleValue = 1.0 / duration;
+                }
+                else
+                {
+                        mLastSampleValue = 0.0;
+                }
+        }
+        sum( (F64) sScaleTimes[SCALE_SECOND], when);
+ }
+// ------------------------------------------------------------------------
 LLStatMeasure::LLStatMeasure(bool use_frame_timer)
        : LLStatAccum(use_frame_timer)
@@ -249,53 +515,209 @@ LLStatMeasure::LLStatMeasure(bool use_frame_timer)
 void LLStatMeasure::sample(F64 value)
 {
-        U64 when = m.getCurrentUsecs();
+        U64 when = getCurrentUsecs();
-        if (m.mLastSampleValid)
+        if (mLastSampleValid)
        {
-                F64 avgValue = (value + m.mLastSampleValue) / 2.0;
+                F64 avgValue = (value + mLastSampleValue) / 2.0;
-                F64 interval = (F64)(when - m.mLastTime);
+                F64 interval = (F64)(when - mLastTime);
-                m.sum(avgValue * interval, when);
+                sum(avgValue * interval, when);
        }
        else
        {
-                m.reset(when);
+                reset(when);
        }
-        m.mLastSampleValid = TRUE;
+        mLastSampleValid = TRUE;
-        m.mLastSampleValue = value;
+        mLastSampleValue = value;
 }
-LLStatRate::LLStatRate(bool use_frame_timer)
+// ------------------------------------------------------------------------
-        : LLStatAccum(use_frame_timer)
+LLStatTime::LLStatTime(const std::string & key)
+        : LLStatAccum(false),
+          mFrameNumber(LLFrameTimer::getFrameCount()),
+          mTotalTimeInFrame(0),
+          mKey(key)
+#if LL_DEBUG
+          , mRunning(FALSE)
+#endif
 {
 }
-void LLStatRate::count(U32 value)
+void LLStatTime::start()
+{
+        // Reset frame accumluation if the frame number has changed
+        U32 frame_number = LLFrameTimer::getFrameCount();
+        if ( frame_number != mFrameNumber )
+        {
+                mFrameNumber = frame_number;
+                mTotalTimeInFrame = 0;
+        }
+        sum(0.0);
+#if LL_DEBUG
+        // Shouldn't be running already
+        llassert( !mRunning );
+        mRunning = TRUE;
+#endif
+}
+void LLStatTime::stop()
+{
+        U64 end_time = getCurrentUsecs();
+        U64 duration = end_time - mLastTime;
+        sum(F64(duration), end_time);
+        //llinfos << "mTotalTimeInFrame incremented from  " << mTotalTimeInFrame << " to " << (mTotalTimeInFrame + duration) << llendl; 
+        mTotalTimeInFrame += duration;
+#if LL_DEBUG
+        mRunning = FALSE;
+#endif
+}
+/* virtual */ F32 LLStatTime::meanValue(TimeScale scale) const
 {
-        m.sum((F64)value * impl::sScaleTimes[SCALE_SECOND]);
+    if ( LLStatAccum::SCALE_PER_FRAME == scale )
+    {
+        return mTotalTimeInFrame;
+    }
+    else
+    {
+        return LLStatAccum::meanValue(scale);
+    }
 }
-LLStatTime::LLStatTime(bool use_frame_timer)
+// ------------------------------------------------------------------------
-        : LLStatAccum(use_frame_timer)
+// Use this constructor for pre-defined LLStatTime objects
+LLPerfBlock::LLPerfBlock(LLStatTime* stat ) : mPredefinedStat(stat), mDynamicStat(NULL)
 {
+    if (mPredefinedStat)
+    {
+        // If dynamic stats are turned on, this will create a separate entry in the stat map.
+        initDynamicStat(mPredefinedStat->mKey);
+        // Start predefined stats.  These stats are not part of the stat map.
+        mPredefinedStat->start();
+    }
 }
-void LLStatTime::start()
+// Use this constructor for dynamically created LLStatTime objects (not pre-defined) with a multi-part key.
+// These are also turned on or off via the switch passed in
+LLPerfBlock::LLPerfBlock( const char* key1, const char* key2 ) : mPredefinedStat(NULL), mDynamicStat(NULL)
 {
-        m.sum(0.0);
+    if (!sStatsEnabled) return;
+    if (NULL == key2 || strlen(key2) == 0)
+    {
+        initDynamicStat(key1);
+    }
+    else
+    {
+        std::ostringstream key;
+        key << key1 << "_" << key2;
+        initDynamicStat(key.str());
+    }
 }
-void LLStatTime::stop()
+void LLPerfBlock::initDynamicStat(const std::string& key)
+{
+    // Early exit if dynamic stats aren't enabled.
+    if (!sStatsEnabled) return;
+    mLastPath = sCurrentStatPath;               // Save and restore current path
+    sCurrentStatPath += "/" + key;              // Add key to current path
+    // See if the LLStatTime object already exists
+    stat_map_t::iterator iter = sStatMap.find(sCurrentStatPath);
+    if ( iter == sStatMap.end() )
+    {
+        // StatEntry object doesn't exist, so create it
+        mDynamicStat = new StatEntry( key );
+        sStatMap[ sCurrentStatPath ] = mDynamicStat;    // Set the entry for this path
+    }
+    else
+    {
+        // Found this path in the map, use the object there
+        mDynamicStat = (*iter).second;          // Get StatEntry for the current path
+    }
+    if (mDynamicStat)
+    {
+        mDynamicStat->mStat.start();
+        mDynamicStat->mCount++;
+    }
+    else
+    {
+        llwarns << "Initialized NULL dynamic stat at '" << sCurrentStatPath << "'" << llendl;
+       sCurrentStatPath = mLastPath;
+    }
+}
+// Destructor does the time accounting
+LLPerfBlock::~LLPerfBlock()
+{
+    if (mPredefinedStat) mPredefinedStat->stop();
+    if (mDynamicStat)
+    {
+        mDynamicStat->mStat.stop();
+        sCurrentStatPath = mLastPath;   // Restore the path in case sStatsEnabled changed during this block
+    }
+}
+// Clear the map of any dynamic stats.  Static routine
+void LLPerfBlock::clearDynamicStats()
+{
+    std::for_each(sStatMap.begin(), sStatMap.end(), DeletePairedPointer());
+    sStatMap.clear();
+}
+// static - Extract the stat info into LLSD
+void LLPerfBlock::addStatsToLLSDandReset( LLSD & stats,
+                                                                                  LLStatAccum::TimeScale scale )
 {
-        U64 endTime = m.getCurrentUsecs();
+    // If we aren't in per-frame scale, we need to go from second to microsecond.
-        m.sum((F64)(endTime - m.mLastTime), endTime);
+    U32 scale_adjustment = 1;
+    if (LLStatAccum::SCALE_PER_FRAME != scale)
+    {
+        scale_adjustment = USEC_PER_SEC;
+    }
+        stat_map_t::iterator iter = sStatMap.begin();
+        for ( ; iter != sStatMap.end(); ++iter )
+        {       // Put the entry into LLSD "/full/path/to/stat/" = microsecond total time
+                const std::string & stats_full_path = (*iter).first;
+                StatEntry * stat = (*iter).second;
+                if (stat)
+                {
+            if (stat->mCount > 0)
+            {
+                stats[stats_full_path] = LLSD::emptyMap();
+                stats[stats_full_path]["us"] = (LLSD::Integer) (scale_adjustment * stat->mStat.meanValue(scale));
+                if (stat->mCount > 1)
+                {
+                    stats[stats_full_path]["count"] = (LLSD::Integer) stat->mCount;
+                }
+                stat->mCount = 0;
+            }
+                }
+                else
+                {       // WTF?  Shouldn't have a NULL pointer in the map.
+            llwarns << "Unexpected NULL dynamic stat at '" << stats_full_path << "'" << llendl;
+                }
+        }       
 }
+// ------------------------------------------------------------------------
 LLTimer LLStat::sTimer;
 LLFrameTimer LLStat::sFrameTimer;
diff --git a/linden/indra/llcommon/llstat.h b/linden/indra/llcommon/llstat.h
index 0a7e014..63813e2 100644
--- a/linden/indra/llcommon/llstat.h
+++ b/linden/indra/llcommon/llstat.h
@@ -33,9 +33,13 @@
 #define LL_LLSTAT_H
 #include <deque>
+#include <map>
 #include "lltimer.h"
 #include "llframetimer.h"
+#include "llfile.h"
+class   LLSD;
 // Set this if longer stats are needed
 #define ENABLE_LONG_TIME_STATS  0
@@ -58,25 +62,50 @@ public:
                SCALE_100MS,
                SCALE_SECOND,
                SCALE_MINUTE,
-                SCALE_TWO_MINUTE,
 #if ENABLE_LONG_TIME_STATS
                SCALE_HOUR,
                SCALE_DAY,
                SCALE_WEEK,
 #endif
-                NUM_SCALES
+                NUM_SCALES,                     // Use to size storage arrays
+                SCALE_PER_FRAME         // For latest frame information - should be after NUM_SCALES since this doesn't go into the time buckets
        };
-        F32 meanValue(TimeScale scale) const;
+        static U64 sScaleTimes[NUM_SCALES];
+        virtual F32 meanValue(TimeScale scale) const;
                // see the subclasses for the specific meaning of value
        F32 meanValueOverLast100ms()  const { return meanValue(SCALE_100MS);  }
        F32 meanValueOverLastSecond() const     { return meanValue(SCALE_SECOND); }
        F32 meanValueOverLastMinute() const     { return meanValue(SCALE_MINUTE); }
-protected:
+        void reset(U64 when);
-        class impl;
-        impl& m;
+        void sum(F64 value);
+        void sum(F64 value, U64 when);
+        U64 getCurrentUsecs() const;
+                // Get current microseconds based on timer type
+        BOOL    mUseFrameTimer;
+        BOOL    mRunning;
+        U64             mLastTime;
+        
+        struct Bucket
+        {
+                F64             accum;
+                U64             endTime;
+                BOOL    lastValid;
+                F64             lastAccum;
+        };
+        Bucket  mBuckets[NUM_SCALES];
+        BOOL    mLastSampleValid;
+        F64     mLastSampleValue;
 };
 class LLStatMeasure : public LLStatAccum
@@ -105,39 +134,120 @@ public:
        void count(U32);
                // used to note that n items have occured
        
-        void mark() { count(1); }
+        void mark();
                // used for counting the rate thorugh a point in the code
 };
-class LLTimeBlock;
 class LLStatTime : public LLStatAccum
        // gathers statistics about time spent in a block of code
        // measure average duration per second in the block
 {
 public:
-        LLStatTime(bool use_frame_timer = false);
+        LLStatTime( const std::string & key = "undefined" );
+        U32             mFrameNumber;           // Current frame number
+        U64             mTotalTimeInFrame;      // Total time (microseconds) accumulated during the last frame
+        void    setKey( const std::string & key )               { mKey = key;   };
+        virtual F32 meanValue(TimeScale scale) const;
 private:
-        void start();
+        void start();                           // Start and stop measuring time block
        void stop();
-        friend class LLTimeBlock;
+        std::string             mKey;           // Tag representing this time block
+#if LL_DEBUG
+        BOOL                    mRunning;       // TRUE if start() has been called
+#endif
+        friend class LLPerfBlock;
 };
-class LLTimeBlock
+// ----------------------------------------------------------------------------
+// Use this class on the stack to record statistics about an area of code
+class LLPerfBlock
 {
 public:
-        LLTimeBlock(LLStatTime& stat) : mStat(stat) { mStat.start(); }
+    struct StatEntry
-        ~LLTimeBlock()                                                          { mStat.stop(); }
+    {
+            StatEntry(const std::string& key) : mStat(LLStatTime(key)), mCount(0) {}
+            LLStatTime  mStat;
+            U32         mCount;
+    };
+    typedef std::map<std::string, StatEntry*>           stat_map_t;
+        // Use this constructor for pre-defined LLStatTime objects
+        LLPerfBlock(LLStatTime* stat);
+        // Use this constructor for dynamically created LLStatTime objects (not pre-defined) with a multi-part key
+        LLPerfBlock( const char* key1, const char* key2 = NULL);
+        ~LLPerfBlock();
+        static void setStatsEnabled( BOOL enable )              { sStatsEnabled = enable;       };
+        static S32  getStatsEnabled()                                   { return sStatsEnabled;         };
+        static void clearDynamicStats();                // Reset maps to clear out dynamic objects
+        static void addStatsToLLSDandReset( LLSD & stats,               // Get current information and clear time bin
+                                                                                LLStatAccum::TimeScale scale );
 private:
-        LLStatTime& mStat;
+        // Initialize dynamically created LLStatTime objects
+    void initDynamicStat(const std::string& key);
+        std::string                             mLastPath;                              // Save sCurrentStatPath when this is called
+        LLStatTime *                    mPredefinedStat;                // LLStatTime object to get data
+        StatEntry *                             mDynamicStat;                   // StatEntryobject to get data
+        static BOOL                             sStatsEnabled;                  // Normally FALSE
+    static stat_map_t           sStatMap;                               // Map full path string to LLStatTime objects
+        static std::string              sCurrentStatPath;               // Something like "frame/physics/physics step"
 };
+// ----------------------------------------------------------------------------
+class LLPerfStats
+{
+public:
+    LLPerfStats(const std::string& process_name = "unknown", S32 process_pid = 0);
+    virtual ~LLPerfStats();
+    virtual void init();    // Reset and start all stat timers
+    virtual void updatePerFrameStats();
+    // Override these function to add process-specific information to the performance log header and per-frame logging.
+    virtual void addProcessHeaderInfo(LLSD& info) { /* not implemented */ }
+    virtual void addProcessFrameInfo(LLSD& info, LLStatAccum::TimeScale scale) { /* not implemented */ }
+    // High-resolution frame stats
+    BOOL    frameStatsIsRunning()                                { return (mReportPerformanceStatEnd > 0.);        };
+    F32     getReportPerformanceInterval() const                { return mReportPerformanceStatInterval;        };
+    void    setReportPerformanceInterval( F32 interval )        { mReportPerformanceStatInterval = interval;    };
+    void    setReportPerformanceDuration( F32 seconds );
+    void    setProcessName(const std::string& process_name) { mProcessName = process_name; }
+    void    setProcessPID(S32 process_pid) { mProcessPID = process_pid; }
+protected:
+    void    openPerfStatsFile();                    // Open file for high resolution metrics logging
+    void    dumpIntervalPerformanceStats();
+    llofstream      mFrameStatsFile;            // File for per-frame stats
+    BOOL            mFrameStatsFileFailure;        // Flag to prevent repeat opening attempts
+    BOOL            mSkipFirstFrameStats;        // Flag to skip one (partial) frame report
+    std::string     mProcessName;
+    S32             mProcessPID;
+private:
+    F32 mReportPerformanceStatInterval;    // Seconds between performance stats
+    F64 mReportPerformanceStatEnd;        // End time (seconds) for performance stats
+};
+// ----------------------------------------------------------------------------
 class LLStat
 {
 public:
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 4032c5b..4b99b71 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,6 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 1;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "alpha";
+const char * const IMP_VERSION_TEST = "RC1";
 #endif
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 4b2e810..4507d94 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -60,6 +60,9 @@ static const std::string INV_SALE_INFO_LABEL("sale_info");
 static const std::string INV_FLAGS_LABEL("flags");
 static const std::string INV_CREATION_DATE_LABEL("created_at");
+// key used by agent-inventory-service
+static const std::string INV_ASSET_TYPE_LABEL_WS("type_default");
+static const std::string INV_FOLDER_ID_LABEL_WS("category_id");
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -1092,11 +1095,13 @@ LLSD LLInventoryItem::asLLSD() const
                sd[INV_SHADOW_ID_LABEL] = shadow_id;
        }
        sd[INV_ASSET_TYPE_LABEL] = LLAssetType::lookup(mType);
+        sd[INV_INVENTORY_TYPE_LABEL] = mInventoryType;
        const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
        if(inv_type_str)
        {
                sd[INV_INVENTORY_TYPE_LABEL] = inv_type_str;
        }
+        //sd[INV_FLAGS_LABEL] = (S32)mFlags;
        sd[INV_FLAGS_LABEL] = ll_sd_from_U32(mFlags);
        sd[INV_SALE_INFO_LABEL] = mSaleInfo;
        sd[INV_NAME_LABEL] = mName;
@@ -1169,17 +1174,40 @@ bool LLInventoryItem::fromLLSD(LLSD& sd)
        w = INV_ASSET_TYPE_LABEL;
        if (sd.has(w))
        {
-                mType = LLAssetType::lookup(sd[w].asString());
+                if (sd[w].isString())
+                {
+                        mType = LLAssetType::lookup(sd[w].asString().c_str());
+                }
+                else if (sd[w].isInteger())
+                {
+                        S8 type = (U8)sd[w].asInteger();
+                        mType = static_cast<LLAssetType::EType>(type);
+                }
        }
        w = INV_INVENTORY_TYPE_LABEL;
        if (sd.has(w))
        {
-                mInventoryType = LLInventoryType::lookup(sd[w].asString());
+                if (sd[w].isString())
+                {
+                        mInventoryType = LLInventoryType::lookup(sd[w].asString().c_str());
+                }
+                else if (sd[w].isInteger())
+                {
+                        S8 type = (U8)sd[w].asInteger();
+                        mInventoryType = static_cast<LLInventoryType::EType>(type);
+                }
        }
        w = INV_FLAGS_LABEL;
        if (sd.has(w))
        {
-                mFlags = ll_U32_from_sd(sd[w]);
+                if (sd[w].isBinary())
+                {
+                        mFlags = ll_U32_from_sd(sd[w]);
+                }
+                else if(sd[w].isInteger())
+                {
+                        mFlags = sd[w].asInteger();
+                }
        }
        w = INV_NAME_LABEL;
        if (sd.has(w))
@@ -1537,7 +1565,7 @@ bool LLInventoryCategory::fromLLSD(LLSD& sd)
 {
    std::string w;
-    w = INV_ITEM_ID_LABEL;
+    w = INV_FOLDER_ID_LABEL_WS;
    if (sd.has(w))
    {
        mUUID = sd[w];
@@ -1553,6 +1581,13 @@ bool LLInventoryCategory::fromLLSD(LLSD& sd)
        S8 type = (U8)sd[w].asInteger();
        mPreferredType = static_cast<LLAssetType::EType>(type);
    }
+        w = INV_ASSET_TYPE_LABEL_WS;
+        if (sd.has(w))
+        {
+                S8 type = (U8)sd[w].asInteger();
+        mPreferredType = static_cast<LLAssetType::EType>(type);
+        }
    w = INV_NAME_LABEL;
    if (sd.has(w))
    {
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 4895378..fef6b05 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -114,7 +114,16 @@ bool LLSaleInfo::fromLLSD(LLSD& sd, BOOL& has_perm_mask, U32& perm_mask)
 {
        const char *w;
-        mSaleType = lookup(sd["sale_type"].asString().c_str());
+        if (sd["sale_type"].isString())
+        {
+                mSaleType = lookup(sd["sale_type"].asString().c_str());
+        }
+        else if(sd["sale_type"].isInteger())
+        {
+                S8 type = (U8)sd["sale_type"].asInteger();
+                mSaleType = static_cast<LLSaleInfo::EForSale>(type);
+        }
        mSalePrice = llclamp(sd["sale_price"].asInteger(), 0, S32_MAX);
        w = "perm_mask";
        if (sd.has(w))
diff --git a/linden/indra/llmath/CMakeLists.txt b/linden/indra/llmath/CMakeLists.txt
index 6a329fa..e5ec3e1 100644
--- a/linden/indra/llmath/CMakeLists.txt
+++ b/linden/indra/llmath/CMakeLists.txt
@@ -11,6 +11,8 @@ include_directories(
 set(llmath_SOURCE_FILES
    llbboxlocal.cpp
+    llcalc.cpp
+    llcalcparser.cpp
    llcamera.cpp
    llcoordframe.cpp
    llline.cpp
@@ -40,6 +42,8 @@ set(llmath_HEADER_FILES
    camera.h
    coordframe.h
    llbboxlocal.h
+    llcalc.h
+    llcalcparser.h
    llcamera.h
    llcoord.h
    llcoordframe.h
diff --git a/linden/indra/llmath/llcalc.cpp b/linden/indra/llmath/llcalc.cpp
new file mode 100644
index 0000000..ff3f91f
--- /dev/null
+++ b/linden/indra/llmath/llcalc.cpp
@@ -0,0 +1,155 @@
+/*
+ *  LLCalc.cpp
+ *  SecondLife
+ *
+ *  Created by Aimee Walton on 28/09/2008.
+ *  Copyright 2008 Aimee Walton.
+ *
+ */
+#include "linden_common.h"
+#include "llcalc.h"
+#include <boost/spirit/core.hpp>
+#include <boost/spirit/error_handling.hpp>
+#include "llcalcparser.h"
+#include "llmath.h"
+// Variable names for use in the build floater
+const char* LLCalc::X_POS = "XP";
+const char* LLCalc::Y_POS = "YP";
+const char* LLCalc::Z_POS = "ZP";
+const char* LLCalc::X_SCALE = "XS";
+const char* LLCalc::Y_SCALE = "YS";
+const char* LLCalc::Z_SCALE = "ZS";
+const char* LLCalc::X_ROT = "XR";
+const char* LLCalc::Y_ROT = "YR";
+const char* LLCalc::Z_ROT = "ZR";
+const char* LLCalc::HOLLOW = "HLW";
+const char* LLCalc::CUT_BEGIN = "CB";
+const char* LLCalc::CUT_END = "CE";
+const char* LLCalc::PATH_BEGIN = "PB";
+const char* LLCalc::PATH_END = "PE";
+const char* LLCalc::TWIST_BEGIN = "TB";
+const char* LLCalc::TWIST_END = "TE";
+const char* LLCalc::X_SHEAR = "XSH";
+const char* LLCalc::Y_SHEAR = "YSH";
+const char* LLCalc::X_TAPER = "XTP";
+const char* LLCalc::Y_TAPER = "YTP";
+const char* LLCalc::RADIUS_OFFSET = "ROF";
+const char* LLCalc::REVOLUTIONS = "REV";
+const char* LLCalc::SKEW = "SKW";
+const char* LLCalc::X_HOLE = "XHL";
+const char* LLCalc::Y_HOLE = "YHL";
+const char* LLCalc::TEX_U_SCALE = "TSU";
+const char* LLCalc::TEX_V_SCALE = "TSV";
+const char* LLCalc::TEX_U_OFFSET = "TOU";
+const char* LLCalc::TEX_V_OFFSET = "TOV";
+const char* LLCalc::TEX_ROTATION = "TROT";
+const char* LLCalc::TEX_TRANSPARENCY = "TRNS";
+const char* LLCalc::TEX_GLOW = "GLOW";
+LLCalc* LLCalc::sInstance = NULL;
+LLCalc::LLCalc() : mLastErrorPos(0)
+{
+//      mUserVariables = new calc_map_t;
+        mVariables = new calc_map_t;
+        mConstants = new calc_map_t;
+                
+        // Init table of constants
+        (*mConstants)["PI"] = F_PI;
+        (*mConstants)["TWO_PI"] = F_TWO_PI;
+        (*mConstants)["PI_BY_TWO"] = F_PI_BY_TWO;
+        (*mConstants)["SQRT2"] = F_SQRT2;
+        (*mConstants)["DEG_TO_RAD"] = DEG_TO_RAD;
+        (*mConstants)["RAD_TO_DEG"] = RAD_TO_DEG;
+        (*mConstants)["GRAVITY"] = GRAVITY;
+}
+LLCalc::~LLCalc()
+{
+        delete mConstants;
+        delete mVariables;
+//      delete mUserVariables;  
+}
+//static
+void LLCalc::cleanUp()
+{
+        delete sInstance;
+        sInstance = NULL;
+}
+//static
+LLCalc* LLCalc::getInstance()
+{
+    if (!sInstance)     sInstance = new LLCalc();
+        return sInstance;
+}
+void LLCalc::setVar(const std::string& name, const F32& value)
+{
+        (*mVariables)[name] = value;
+}
+void LLCalc::clearVar(const std::string& name)
+{
+        mVariables->erase(name);
+}
+void LLCalc::clearAllVariables()
+{
+        mVariables->clear();
+}
+/*
+void LLCalc::updateVariables(LLSD& vars)
+{
+        LLSD::map_iterator cIt = vars.beginMap();
+        for(; cIt != vars.endMap(); cIt++)
+        {
+                setVar(cIt->first, (F32)(LLSD::Real)cIt->second);
+        }
+}
+*/
+bool LLCalc::evalString(const std::string& expression, F32& result)
+{
+        using namespace boost::spirit;
+        
+        std::string expr_upper = expression;
+        LLStringUtil::toUpper(expr_upper);
+        
+        LLCalcParser calc(result, mConstants, mVariables);
+        mLastErrorPos = 0;
+        std::string::iterator start = expr_upper.begin();
+        parse_info<std::string::iterator> info;
+        
+        try
+        {
+                info = parse(start, expr_upper.end(), calc, space_p);
+                lldebugs << "Math expression: " << expression << " = " << result << llendl;
+        }
+        catch(parser_error<std::string, std::string::iterator> &e)
+        {
+                mLastErrorPos = e.where - expr_upper.begin();
+                
+                llinfos << "Calc parser exception: " << e.descriptor << " at " << mLastErrorPos << " in expression: " << expression << llendl;
+                return false;
+        }
+        
+        if (!info.full)
+        {
+                mLastErrorPos = info.stop - expr_upper.begin();
+                llinfos << "Unhandled syntax error at " << mLastErrorPos << " in expression: " << expression << llendl;
+                return false;
+        }
+        
+        return true;
+}
diff --git a/linden/indra/llmath/llcalc.h b/linden/indra/llmath/llcalc.h
new file mode 100644
index 0000000..a376895
--- /dev/null
+++ b/linden/indra/llmath/llcalc.h
@@ -0,0 +1,85 @@
+/*
+ *  LLCalc.h
+ *  SecondLife
+ *
+ *  Created by Aimee Walton on 28/09/2008.
+ *  Copyright 2008 Aimee Walton.
+ *
+ */
+#ifndef LL_CALC_H
+#define LL_CALC_H
+#include <map>
+#include <string>
+//#include "llsd.h"
+class LLCalc
+{
+public:
+        LLCalc();
+        ~LLCalc();
+        // Variable name constants
+        static const char* X_POS;
+        static const char* Y_POS;
+        static const char* Z_POS;
+        static const char* X_SCALE;
+        static const char* Y_SCALE;
+        static const char* Z_SCALE;
+        static const char* X_ROT;
+        static const char* Y_ROT;
+        static const char* Z_ROT;
+        static const char* HOLLOW;
+        static const char* CUT_BEGIN;
+        static const char* CUT_END;
+        static const char* PATH_BEGIN;
+        static const char* PATH_END;
+        static const char* TWIST_BEGIN;
+        static const char* TWIST_END;
+        static const char* X_SHEAR;
+        static const char* Y_SHEAR;
+        static const char* X_TAPER;
+        static const char* Y_TAPER;
+        static const char* RADIUS_OFFSET;
+        static const char* REVOLUTIONS;
+        static const char* SKEW;
+        static const char* X_HOLE;
+        static const char* Y_HOLE;
+        static const char* TEX_U_SCALE;
+        static const char* TEX_V_SCALE;
+        static const char* TEX_U_OFFSET;
+        static const char* TEX_V_OFFSET;
+        static const char* TEX_ROTATION;
+        static const char* TEX_TRANSPARENCY;
+        static const char* TEX_GLOW;
+        void    setVar(const std::string& name, const F32& value);
+        void    clearVar(const std::string& name);
+        void    clearAllVariables();
+//      void    updateVariables(LLSD& vars);
+        bool    evalString(const std::string& expression, F32& result);
+        std::string::size_type  getLastErrorPos()       { return mLastErrorPos; }
+        
+        static LLCalc* getInstance();
+        static void cleanUp();
+        typedef std::map<std::string, F32> calc_map_t;
+        
+private:
+        std::string::size_type  mLastErrorPos;
+        
+        calc_map_t*     mConstants;
+        calc_map_t*     mVariables;
+        
+        // *TODO: Add support for storing user defined variables, and stored functions.
+        //      Will need UI work, and a means to save them between sessions.
+//      calc_map_t* mUserVariables;
+        
+        // "There shall be only one"
+        static LLCalc*  sInstance;
+};
+#endif // LL_CALC_H
diff --git a/linden/indra/llmath/llcalcparser.cpp b/linden/indra/llmath/llcalcparser.cpp
new file mode 100644
index 0000000..1546c09
--- /dev/null
+++ b/linden/indra/llmath/llcalcparser.cpp
@@ -0,0 +1,45 @@
+/*
+ *  LLCalcParser.cpp
+ *  SecondLife
+ *
+ *  Created by Aimee Walton on 28/09/2008.
+ *  Copyright 2008 Aimee Walton.
+ *
+ */
+#include "linden_common.h"
+#include "llcalcparser.h"
+F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::iterator& end) const
+{
+        LLCalc::calc_map_t::iterator iter;
+        std::string name(start, end);
+        
+        if (mConstants)
+        {
+                iter = mConstants->find(name);
+                if (iter != mConstants->end())
+                {
+                        return (*iter).second;
+                }
+        }
+        else
+        {
+                // This should never happen!
+                boost::spirit::throw_(end, std::string("Missing constants table"));
+        }
+        
+        if (mVariables)
+        {
+                iter = mVariables->find(name);
+                if (iter != mVariables->end())
+                {
+                        return (*iter).second;
+                }
+        }
+        
+        boost::spirit::throw_(end, std::string("Unknown symbol " + name));
+        return 0.f;
+}
diff --git a/linden/indra/llmath/llcalcparser.h b/linden/indra/llmath/llcalcparser.h
new file mode 100644
index 0000000..c405b62
--- /dev/null
+++ b/linden/indra/llmath/llcalcparser.h
@@ -0,0 +1,155 @@
+/*
+ *  LLCalcParser.h
+ *  SecondLife
+ *
+ *  Created by Aimee Walton on 28/09/2008.
+ *  Copyright 2008 Aimee Walton.
+ *
+ */
+#ifndef LL_CALCPARSER_H
+#define LL_CALCPARSER_H
+#include <boost/spirit/attribute.hpp>
+#include <boost/spirit/core.hpp>
+#include <boost/spirit/error_handling.hpp>
+#include <boost/spirit/iterator/position_iterator.hpp>
+#include <boost/spirit/phoenix/binders.hpp>
+//#include <boost/spirit/symbols/symbols.hpp>
+#include <map>
+#include <string>
+#include "llcalc.h"
+#include "llmath.h"
+struct LLCalcParser : boost::spirit::grammar<LLCalcParser>
+{
+        LLCalcParser(F32& result, LLCalc::calc_map_t* constants, LLCalc::calc_map_t* vars) :
+                mResult(result), mConstants(constants), mVariables(vars) {};
+        
+        struct value_closure : boost::spirit::closure<value_closure, F32>
+        {
+                member1 value;
+        };
+        
+        template <typename ScannerT>
+        struct definition
+        {
+                // Rule declarations
+                boost::spirit::rule<ScannerT> statement, identifier;
+                boost::spirit::rule<ScannerT, value_closure::context_t> expression, term,
+                        power, 
+                        unary_expr, 
+                        factor, 
+                        /*unary_func, 
+                        /binary_func,*/ 
+                        group;
+                // start() should return the starting symbol
+                boost::spirit::rule<ScannerT> const& start() const { return statement; }
+                
+                definition(LLCalcParser const& self)
+                {
+                        using namespace boost::spirit;
+                        using namespace phoenix;
+                        
+                        assertion<std::string> assert_domain("Domain error");
+//                      assertion<std::string> assert_symbol("Unknown symbol");
+                        assertion<std::string> assert_syntax("Syntax error");
+                        
+                        identifier =
+                                lexeme_d[(alpha_p | '_') >> *(alnum_p | '_')]
+                        ;
+                        
+                        group =
+                                '(' >> expression[group.value = arg1] >> assert_syntax(ch_p(')'))
+                        ;
+                        
+                        /*unary_func =
+                                ((str_p("SIN") >> '(' >> expression[unary_func.value = bind(&sin)(DEG_TO_RAD * arg1)]) |
+                                 (str_p("COS") >> '(' >> expression[unary_func.value = bind(&cos)(DEG_TO_RAD * arg1)]) |
+                                 (str_p("TAN") >> '(' >> expression[unary_func.value = bind(&tan)(DEG_TO_RAD * arg1)]) |
+                                 (str_p("ASIN") >> '(' >> expression[unary_func.value = (bind(&asin)(arg1)) * RAD_TO_DEG]) |
+                                 (str_p("ACOS") >> '(' >> expression[unary_func.value = bind(&acos)(arg1) * RAD_TO_DEG]) |
+                                 (str_p("ATAN") >> '(' >> expression[unary_func.value = bind(&atan)(arg1) * RAD_TO_DEG]) |
+                                 (str_p("SQRT") >> '(' >> expression[unary_func.value = bind(&sqrt)(arg1)]) |
+                                 (str_p("LOG") >> '(' >> expression[unary_func.value = bind(&log)(arg1)]) |
+                                 (str_p("EXP") >> '(' >> expression[unary_func.value = bind(&exp)(arg1)]) |
+                                 (str_p("ABS") >> '(' >> expression[unary_func.value = bind(&fabs)(arg1)])
+                                ) >> assert_syntax(ch_p(')'))
+                        ;
+                        
+                        binary_func =
+                                ((str_p("ATAN2") >> '(' >> expression[binary_func.value = arg1] >> ',' >>
+                                  expression[binary_func.value = bind(&atan2)(binary_func.value, arg1) * RAD_TO_DEG]) |
+                                 (str_p("MIN") >> '(' >> expression[binary_func.value = arg1] >> ',' >> 
+                                  expression[binary_func.value = bind(&LLCalcParser::min)(self, binary_func.value, arg1)]) |
+                                 (str_p("MAX") >> '(' >> expression[binary_func.value = arg1] >> ',' >> 
+                                  expression[binary_func.value = bind(&LLCalcParser::max)(self, binary_func.value, arg1)])
+                                ) >> assert_syntax(ch_p(')'))
+                        ;*/
+                        
+                        // *TODO: Localisation of the decimal point?
+                        // Problem, LLLineEditor::postvalidateFloat accepts a comma when appropriate
+                        // for the current locale. However to do that here could clash with using
+                        // the comma as a separator when passing arguments to functions.
+                        factor =
+                                (ureal_p[factor.value = arg1] |
+                                 group[factor.value = arg1] |
+                                 /*unary_func[factor.value = arg1] |
+                                 binary_func[factor.value = arg1] |*/
+                                 // Lookup throws an Unknown Symbol error if it is unknown, while this works fine,
+                                 // would be "neater" to handle symbol lookup from here with an assertive parser.
+//                               constants_p[factor.value = arg1]|
+                                 identifier[factor.value = bind(&LLCalcParser::lookup)(self, arg1, arg2)]
+                                ) >>
+                                // Detect and throw math errors.
+                                assert_domain(eps_p(bind(&LLCalcParser::checkNaN)(self, factor.value)))
+                        ;
+                        unary_expr =
+                                !ch_p('+') >> factor[unary_expr.value = arg1] |
+                                '-' >> factor[unary_expr.value = -arg1]
+                        ;
+                        
+                        power =
+                                unary_expr[power.value = arg1] >>
+                                *('^' >> assert_syntax(unary_expr[power.value = bind(&powf)(power.value, arg1)]))
+                        ;
+                        
+                        term =
+                                power[term.value = arg1] >>
+                                *(('*' >> assert_syntax(power[term.value *= arg1])) |
+                                  ('/' >> assert_syntax(power[term.value /= arg1]))
+                                )
+                        ;
+                        
+                        expression =
+                                assert_syntax(term[expression.value = arg1]) >>
+                                *(('+' >> assert_syntax(term[expression.value += arg1])) |
+                                  ('-' >> assert_syntax(term[expression.value -= arg1]))
+                                )
+                        ;
+                        statement =
+                                !ch_p('=') >> ( expression )[var(self.mResult) = arg1] >> (end_p)
+                        ;
+                }
+        };
+        
+private:
+        // Member functions for semantic actions
+        F32     lookup(const std::string::iterator&, const std::string::iterator&) const;
+        F32 min(const F32& a, const F32& b) const { return llmin(a, b); }
+        F32 max(const F32& a, const F32& b) const { return llmax(a, b); }
+        
+        bool checkNaN(const F32& a) const { return !llisnan(a); }
+        LLCalc::calc_map_t* mConstants;
+        LLCalc::calc_map_t* mVariables;
+//      LLCalc::calc_map_t* mUserVariables;
+        
+        F32&            mResult;
+};
+#endif // LL_CALCPARSER_H
diff --git a/linden/indra/llmath/llmodularmath.h b/linden/indra/llmath/llmodularmath.h
new file mode 100644
index 0000000..67083ea
--- /dev/null
+++ b/linden/indra/llmath/llmodularmath.h
@@ -0,0 +1,57 @@
+/** 
+ * @file llmodularmath.h
+ * @brief Useful modular math functions.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLMODULARMATH_H
+#define LLMODULARMATH_H
+namespace LLModularMath
+{
+    // Return difference between lhs and rhs
+    // treating the U32 operands and result
+    // as unsigned values of given width.
+        template<int width>
+        inline U32 subtract(U32 lhs, U32 rhs)
+        {
+                // Generate a bit mask which will truncate
+                // unsigned values to given width at compile time.
+                const U32 mask = (1 << width) - 1;
+                
+                // Operands are unsigned, so modular
+                // arithmetic applies. If lhs < rhs,
+                // difference will wrap in to lower
+                // bits of result, which is then masked
+                // to give a value that can be represented
+                // by an unsigned value of width bits.
+                return mask & (lhs - rhs);
+        }       
+}
+#endif
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 12a1520..7b2f241 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -60,6 +60,7 @@
 #include "llrand.h"
 #include "llstl.h"
 #include "lltransfermanager.h"
+#include "llmodularmath.h"
 const F32 PING_INTERVAL = 5.f; // seconds
 const S32 PING_START_BLOCK = 3;         // How many pings behind we have to be to consider ourself blocked.
@@ -676,6 +677,8 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
                mPacketsIn++;
                setPacketInID((id + 1) % LL_MAX_OUT_PACKET_ID);
+        mLastPacketGap = 0;
+        mOutOfOrderRate.count(0);
                return;
        }
@@ -683,6 +686,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
        // now, check to see if we've got a gap
+    U32 gap = 0;
        if ((mPacketsInID == id))
        {
                // nope! bump and wrap the counter, then return
@@ -704,6 +708,11 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
                // otherwise, walk from mCurrentCircuit->mPacketsInID to id with wrapping, adding the values to the map
                // and setting mPacketsInID to id + 1 % LL_MAX_OUT_PACKET_ID
+        // babbage: all operands in expression are unsigned, so modular 
+                // arithmetic will always find correct gap, regardless of wrap arounds.
+                const U8 width = 24;
+                gap = LLModularMath::subtract<width>(mPacketsInID, id);
                if (mPotentialLostPackets.find(id) != mPotentialLostPackets.end())
                {
                        if(gMessageSystem->mVerboseLog)
@@ -765,6 +774,8 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
                }
        }
+    mOutOfOrderRate.count(gap);
+    mLastPacketGap = gap;
 }
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h
index 552b50f..b53c955 100644
--- a/linden/indra/llmessage/llcircuit.h
+++ b/linden/indra/llmessage/llcircuit.h
@@ -45,6 +45,7 @@
 #include "llpacketack.h"
 #include "lluuid.h"
 #include "llthrottle.h"
+#include "llstat.h"
 //
 // Constants
@@ -133,6 +134,10 @@ public:
        S32                     getUnackedPacketCount() const   { return mUnackedPacketCount; }
        S32                     getUnackedPacketBytes() const   { return mUnackedPacketBytes; }
        F64         getNextPingSendTime() const { return mNextPingSendTime; }
+    F32         getOutOfOrderRate(LLStatAccum::TimeScale scale = LLStatAccum::SCALE_MINUTE) 
+                    { return mOutOfOrderRate.meanValue(scale); }
+    U32         getLastPacketGap() const { return mLastPacketGap; }
+    LLHost      getHost() const { return mHost; }
        LLThrottleGroup &getThrottleGroup()             {       return mThrottles; }
@@ -276,6 +281,9 @@ protected:
        LLTimer mExistenceTimer;            // initialized when circuit created, used to track bandwidth numbers
        S32             mCurrentResendCount;    // Number of resent packets since last spam
+    LLStatRate  mOutOfOrderRate;    // Rate of out of order packets coming in.
+    U32     mLastPacketGap;         // Gap in sequence number of last packet.
 };
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 834ec4b..167e237 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -265,6 +265,10 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
                delete easy;
                return NULL;
        }
+        
+        // set no DMS caching as default for all easy handles. This prevents them adopting a
+        // multi handles cache if they are added to one.
+        curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0);
        ++gCurlEasyCount;
        return easy;
 }
@@ -747,7 +751,7 @@ bool LLCurlRequest::post(const std::string& url, const LLSD& data, LLCurl::Respo
        easy->setopt(CURLOPT_POSTFIELDS, (void*)NULL);
        easy->setopt(CURLOPT_POSTFIELDSIZE, bytes);
-        easy->slist_append("Content-Type: application/xml");
+        easy->slist_append("Content-Type: application/llsd+xml");
        easy->setHeaders();
        lldebugs << "POSTING: " << bytes << " bytes." << llendl;
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index fdd521f..6d5a716 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -256,6 +256,10 @@ void LLHTTPAssetRequest::setupCurlHandle()
                        // disable use of proxy, which can't handle chunked transfers
        }
        mHTTPHeaders = curl_slist_append(mHTTPHeaders, "Pragma:");
+        // bug in curl causes DNS to be cached for too long a time, 0 sets it to never cache DNS results internally (to curl)
+        curl_easy_setopt(mCurlHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0);
+        
        // resist the temptation to explicitly add the Transfer-Encoding: chunked
        // header here - invokes a libCURL bug
        curl_easy_setopt(mCurlHandle, CURLOPT_HTTPHEADER, mHTTPHeaders);
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index ef163fa..a07f379 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -106,7 +106,7 @@ namespace
                LLSDInjector(const LLSD& sd) : mSD(sd) {}
                virtual ~LLSDInjector() {}
-                const char* contentType() { return "application/xml"; }
+                const char* contentType() { return "application/llsd+xml"; }
                virtual EStatus process_impl(const LLChannelDescriptors& channels,
                        buffer_ptr_t& buffer, bool& eos, LLSD& context, LLPumpIO* pump)
@@ -160,9 +160,10 @@ namespace
                                fstream.seekg(0, std::ios::end);
                                U32 fileSize = fstream.tellg();
                                fstream.seekg(0, std::ios::beg);
-                                std::vector<char> fileBuffer(fileSize);
+                                char* fileBuffer;
-                                fstream.read(&fileBuffer[0], fileSize);
+                                fileBuffer = new char [fileSize];
-                                ostream.write(&fileBuffer[0], fileSize);
+                                fstream.read(fileBuffer, fileSize);
+                                ostream.write(fileBuffer, fileSize);
                                fstream.close();
                                eos = true;
                                return STATUS_DONE;
@@ -189,9 +190,10 @@ namespace
                        
                        LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
                        S32 fileSize = vfile.getSize();
-                        std::vector<U8> fileBuffer(fileSize);
+                        U8* fileBuffer;
-                        vfile.read(&fileBuffer[0], fileSize);
+                        fileBuffer = new U8 [fileSize];
-                        ostream.write((char*)&fileBuffer[0], fileSize);
+            vfile.read(fileBuffer, fileSize);
+            ostream.write((char*)fileBuffer, fileSize);
                        eos = true;
                        return STATUS_DONE;
                }
@@ -236,7 +238,8 @@ static void request(
            //the Pragma header it so gratuitously inserts
            //Before inserting the header, force libcurl
            //to not use the proxy (read: llurlrequest.cpp)
-            if ((iter->first == "Pragma") && (iter->second.asString() == ""))
+                        static const std::string PRAGMA("Pragma");
+                        if ((iter->first == PRAGMA) && (iter->second.asString().empty()))
            {
                req->useProxy(false);
            }
@@ -245,6 +248,19 @@ static void request(
            req->addHeader(header.str().c_str());
        }
    }
+        // Check to see if we have already set Accept or not. If no one
+        // set it, set it to application/llsd+xml since that's what we
+        // almost always want.
+        if( method != LLURLRequest::HTTP_PUT && method != LLURLRequest::HTTP_POST )
+        {
+                static const std::string ACCEPT("Accept");
+                if(!headers.has(ACCEPT))
+                {
+                        req->addHeader("Accept: application/llsd+xml");
+                }
+        }
        req->setCallback(new LLHTTPClientURLAdaptor(responder));
        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem)
@@ -252,12 +268,22 @@ static void request(
                req->addHeader(llformat("X-SecondLife-UDP-Listen-Port: %d",
                                                                gMessageSystem->mPort).c_str());
        }
-        
        if (method == LLURLRequest::HTTP_PUT || method == LLURLRequest::HTTP_POST)
        {
-                req->addHeader(llformat("Content-Type: %s",
+                static const std::string CONTENT_TYPE("Content-Type");
-                                                                body_injector->contentType()).c_str());
+                if(!headers.has(CONTENT_TYPE))
+                {
+                        // If the Content-Type header was passed in, it has
+                        // already been added as a header through req->addHeader
+                        // in the loop above. We defer to the caller's wisdom, but
+                        // if they did not specify a Content-Type, then ask the
+                        // injector.
+                        req->addHeader(
+                                llformat(
+                                        "Content-Type: %s",
+                                        body_injector->contentType()).c_str());
+                }
                chain.push_back(LLIOPipe::ptr_t(body_injector));
        }
@@ -284,9 +310,13 @@ void LLHTTPClient::getByteRange(
    request(url,LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
-void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::head(
+        const std::string& url,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout);
+        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
@@ -397,39 +427,66 @@ LLSD LLHTTPClient::blockingGet(const std::string& url)
        return response;
 }
-void LLHTTPClient::put(const std::string& url, const LLSD& body, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::put(
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder, timeout);
+        request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder, timeout, headers);
 }
-void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::post(
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout, headers);
 }
-void LLHTTPClient::postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postRaw(
+        const std::string& url,
+        const U8* data,
+        S32 size,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout, headers);
 }
-void LLHTTPClient::postFile(const std::string& url, const std::string& filename, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postFile(
+        const std::string& url,
+        const std::string& filename,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout, headers);
 }
-void LLHTTPClient::postFile(const std::string& url, const LLUUID& uuid,
+void LLHTTPClient::postFile(
-                                                        LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout)
+        const std::string& url,
+        const LLUUID& uuid,
+        LLAssetType::EType asset_type,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout, headers);
 }
 // static
 void LLHTTPClient::del(
        const std::string& url,
        ResponderPtr responder,
+        const LLSD& headers,
        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
+        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout, headers);
 }
 // static
@@ -437,9 +494,10 @@ void LLHTTPClient::move(
        const std::string& url,
        const std::string& destination,
        ResponderPtr responder,
+        const LLSD& hdrs,
        const F32 timeout)
 {
-        LLSD headers;
+        LLSD headers = hdrs;
        headers["Destination"] = destination;
        request(url, LLURLRequest::HTTP_MOVE, NULL, responder, timeout, headers);
 }
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 50c6f7a..367098f 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -62,28 +62,56 @@ public:
        /** @name non-blocking API */
        //@{
-        static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void head(
+                const std::string& url,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void getByteRange(const std::string& url, S32 offset, S32 bytes, ResponderPtr, const LLSD& headers=LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void get(const std::string& url, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void get(const std::string& url, const LLSD& query, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void put(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void put(
+                const std::string& url,
+                const LLSD& body,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void getHeaderOnly(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void getHeaderOnly(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void post(
+                const std::string& url,
+                const LLSD& body,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        /** Takes ownership of data and deletes it when sent */
-        static void postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void postRaw(
-        
+                const std::string& url,
-        static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+                const U8* data,
-        #
+                S32 size,
-        static void postFile(const std::string& url, const LLUUID& uuid,
+                ResponderPtr responder,
-                LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void postFile(
+                const std::string& url,
+                const std::string& filename,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void postFile(
+                const std::string& url,
+                const LLUUID& uuid,
+                LLAssetType::EType asset_type,
+                ResponderPtr responder,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void del(
                const std::string& url,
                ResponderPtr responder,
+                const LLSD& headers = LLSD(),
                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
                ///< sends a DELETE method, but we can't call it delete in c++
        
@@ -93,12 +121,14 @@ public:
         * @param url The complete serialized (and escaped) url to get.
         * @param destination The complete serialized destination url.
         * @param responder The responder that will handle the result.
+         * @param headers A map of key:value headers to pass to the request
         * @param timeout The number of seconds to give the server to respond.
         */
        static void move(
                const std::string& url,
                const std::string& destination,
                ResponderPtr responder,
+                const LLSD& headers = LLSD(),
                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        //@}
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index d4155f6..64222ff 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -47,6 +47,7 @@
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llsdserialize_xml.h"
+#include "llstat.h"
 #include "llstl.h"
 #include "lltimer.h"
@@ -171,22 +172,26 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                std::string verb = context[CONTEXT_REQUEST][CONTEXT_VERB];
                if(verb == HTTP_VERB_GET)
                {
+            LLPerfBlock getblock("http_get");   
                        mNode.get(LLHTTPNode::ResponsePtr(mResponse), context);
                }
                else if(verb == HTTP_VERB_PUT)
                {
+            LLPerfBlock putblock("http_put");
                        LLSD input;
                        LLSDSerialize::fromXML(input, istr);
                        mNode.put(LLHTTPNode::ResponsePtr(mResponse), context, input);
                }
                else if(verb == HTTP_VERB_POST)
                {
+            LLPerfBlock postblock("http_post");
                        LLSD input;
                        LLSDSerialize::fromXML(input, istr);
                        mNode.post(LLHTTPNode::ResponsePtr(mResponse), context, input);
                }
                else if(verb == HTTP_VERB_DELETE)
                {
+            LLPerfBlock delblock("http_delete");
                        mNode.del(LLHTTPNode::ResponsePtr(mResponse), context);
                }               
                else if(verb == HTTP_VERB_OPTIONS)
@@ -240,7 +245,7 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                case STATE_GOOD_RESULT:
                {
                        LLSD headers = mHeaders;
-                        headers["Content-Type"] = "application/xml";
+                        headers["Content-Type"] = "application/llsd+xml";
                        context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = headers;
                        LLBufferStream ostr(channels, buffer.get());
                        LLSDSerialize::toXML(mGoodResult, ostr);
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index dec83b0..28fee37 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -355,8 +355,11 @@ LLIOPipe::EStatus LLIOSocketReader::process_impl(
        }
        else if(APR_STATUS_IS_EAGAIN(status))
        {
+/*Commented out by Aura 9-9-8 for DEV-19961.
                // everything is fine, but we can terminate this process pump.
+        
                rv = STATUS_BREAK;
+*/
        }
        else
        {
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index 8ae7206..0504080 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -51,6 +51,7 @@
 #include "llblowfishcipher.h"
 #include "llerror.h"
 #include "llhost.h"
+#include "llsd.h"
 #include "llstring.h"
 #include "lluuid.h"
 #include "net.h"
@@ -111,16 +112,22 @@ void disconnect_smtp()
 // Returns TRUE on success.
 // message should NOT be SMTP escaped.
 // static
-BOOL LLMail::send(const char* from_name, const char* from_address,
+BOOL LLMail::send(
-                           const char* to_name, const char* to_address,
+        const char* from_name,
-                           const char* subject, const char* message)
+        const char* from_address,
+        const char* to_name,
+        const char* to_address,
+        const char* subject,
+        const char* message,
+        const LLSD& headers)
 {
        std::string header = buildSMTPTransaction(
                from_name,
                from_address,
                to_name,
                to_address,
-                subject);
+                subject,
+                headers);
        if(header.empty())
        {
                return FALSE;
@@ -192,7 +199,8 @@ std::string LLMail::buildSMTPTransaction(
        const char* from_address,
        const char* to_name,
        const char* to_address,
-        const char* subject)
+        const char* subject,
+        const LLSD& headers)
 {
        if(!from_address || !to_address)
        {
@@ -236,8 +244,20 @@ std::string LLMail::buildSMTPTransaction(
                << "DATA\r\n"
                << "From: " << from_fmt.str() << "\r\n"
                << "To: " << to_fmt.str() << "\r\n"
-                << "Subject: " << subject << "\r\n"
+                << "Subject: " << subject << "\r\n";
-                << "\r\n";
+        
+        if(headers.isMap())
+        {
+                LLSD::map_const_iterator iter = headers.beginMap();
+                LLSD::map_const_iterator end = headers.endMap();
+                for(; iter != end; ++iter)
+                {
+                        header << (*iter).first << ": " << ((*iter).second).asString()
+                                << "\r\n";
+                }
+        }
+        header << "\r\n";
        return header.str();
 }
diff --git a/linden/indra/llmessage/llmail.h b/linden/indra/llmessage/llmail.h
index 86b7793..018e180 100644
--- a/linden/indra/llmessage/llmail.h
+++ b/linden/indra/llmessage/llmail.h
@@ -34,7 +34,7 @@
 typedef struct apr_pool_t apr_pool_t;
-class LLUUID;
+#include "llsd.h"
 class LLMail
 {
@@ -45,34 +45,51 @@ public:
        // Allow all email transmission to be disabled/enabled.
        static void enable(bool mail_enabled);
-        // returns TRUE if the call succeeds, FALSE otherwise.
+        /**
-        //
+         * @brief send an email
-        // Results in:
+         * @param from_name The name of the email sender
-        // From: "from_name" <from_address>
+         * @param from_address The email address for the sender
-        // To:   "to_name" <to_address>
+         * @param to_name The name of the email recipient
-        // Subject: subject
+         * @param to_address The email recipient address
-        // message
+         * @param subject The subject of the email
-        static BOOL send(const char* from_name, const char* from_address,
+         * @param headers optional X-Foo headers in an llsd map. 
-                                const char* to_name, const char* to_address,
+         * @return Returns TRUE if the call succeeds, FALSE otherwise.
-                                const char* subject, const char* message);
+         *
+         * Results in:
+         * From: "from_name" <from_address>
+         * To:   "to_name" <to_address>
+         * Subject: subject
+         * 
+         * message
+         */
+        static BOOL send(
+                const char* from_name,
+                const char* from_address,
+                const char* to_name,
+                const char* to_address,
+                const char* subject,
+                const char* message,
+                const LLSD& headers = LLSD());
        /**
-        * @brief build the complete smtp transaction & header for use in an
+         * @brief build the complete smtp transaction & header for use in an
-        * mail.
+         * mail.
-        *
+         *
-        * @param from_name The name of the email sender
+         * @param from_name The name of the email sender
-        * @param from_address The email address for the sender
+         * @param from_address The email address for the sender
-        * @param to_name The name of the email recipient
+         * @param to_name The name of the email recipient
-        * @param to_name The email recipient address
+         * @param to_address The email recipient address
-        * @param subject The subject of the email
+         * @param subject The subject of the email
-        * @return Returns the complete SMTP transaction mail header.
+         * @param headers optional X-Foo headers in an llsd map. 
-        */
+         * @return Returns the complete SMTP transaction mail header.
+         */
        static std::string buildSMTPTransaction(
                const char* from_name,
                const char* from_address,
                const char* to_name,
                const char* to_address,
-                const char* subject);
+                const char* subject,
+                const LLSD& headers = LLSD());
        /**
        * @brief send an email with header and body.
diff --git a/linden/indra/llmessage/llmessagetemplate.cpp b/linden/indra/llmessage/llmessagetemplate.cpp
index 4a560ca..ff44d45 100644
--- a/linden/indra/llmessage/llmessagetemplate.cpp
+++ b/linden/indra/llmessage/llmessagetemplate.cpp
@@ -50,7 +50,7 @@ void LLMsgVarData::addData(const void *data, S32 size, EMsgVariableType type, S3
        }
        if(size)
        {
-                delete mData; // Delete it if it already exists
+                delete[] mData; // Delete it if it already exists
                mData = new U8[size];
                htonmemcpy(mData, data, mType, size);
        }
@@ -175,3 +175,23 @@ std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg)
        return s;
 }
+void LLMessageTemplate::banUdp()
+{
+        static const char* deprecation[] = {
+                "NotDeprecated",
+                "Deprecated",
+                "UDPDeprecated",
+                "UDPBlackListed"
+        };
+        if (mDeprecation != MD_DEPRECATED)
+        {
+                llinfos << "Setting " << mName << " to UDPBlackListed was " << deprecation[mDeprecation] << llendl;
+                mDeprecation = MD_UDPBLACKLISTED;
+        }
+        else
+        {
+                llinfos << mName << " is already more deprecated than UDPBlackListed" << llendl;
+        }
+}
diff --git a/linden/indra/llmessage/llmessagetemplate.h b/linden/indra/llmessage/llmessagetemplate.h
index 716c618..445d1a8 100644
--- a/linden/indra/llmessage/llmessagetemplate.h
+++ b/linden/indra/llmessage/llmessagetemplate.h
@@ -34,6 +34,7 @@
 #include "lldarray.h"
 #include "message.h" // TODO: babbage: Remove...
+#include "llstat.h"
 #include "llstl.h"
 class LLMsgVarData
@@ -370,20 +371,23 @@ public:
        {
                if (mHandlerFunc)
                {
+            LLPerfBlock msg_cb_time("msg_cb", mName);
                        mHandlerFunc(msgsystem, mUserData);
                        return TRUE;
                }
                return FALSE;
        }
-        bool isBanned(bool trustedSource) const
+        bool isUdpBanned() const
        {
-                return trustedSource ? mBanFromTrusted : mBanFromUntrusted;
+                return mDeprecation == MD_UDPBLACKLISTED;
        }
-        bool isUdpBanned() const
+        void banUdp();
+        bool isBanned(bool trustedSource) const
        {
-                return mDeprecation == MD_UDPBLACKLISTED;
+                return trustedSource ? mBanFromTrusted : mBanFromUntrusted;
        }
        friend std::ostream&     operator<<(std::ostream& s, LLMessageTemplate &msg);
diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index ad9df26..47e1bd6 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -119,7 +119,7 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg
        full_mesg << to << mesg;
        // Create an entry for this message.
-        size_t hash = llhash<const char*> (full_mesg.str().c_str());
+        size_t hash = llhash(full_mesg.str().c_str());
        LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
        // Check if this message is already in the list.
@@ -153,7 +153,7 @@ BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, c
        full_mesg << agent << task << mesg;
        // Create an entry for this message.
-        size_t hash = llhash<const char*> (full_mesg.str().c_str());
+        size_t hash = llhash(full_mesg.str().c_str());
        LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
        // Check if this message is already in the list.
diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index c44f6ce..f661261 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -896,7 +896,7 @@ void LLNameValue::setVec3(const LLVector3 &a)
 }
-std::string LLNameValue::printNameValue()
+std::string LLNameValue::printNameValue() const
 {
        std::string buffer;
        buffer = llformat("%s %s %s %s ", mName, mStringType, mStringClass, mStringSendto);
@@ -905,7 +905,7 @@ std::string LLNameValue::printNameValue()
        return buffer;
 }
-std::string LLNameValue::printData()
+std::string LLNameValue::printData() const
 {
        std::string buffer;
        switch(mType)
diff --git a/linden/indra/llmessage/llnamevalue.h b/linden/indra/llmessage/llnamevalue.h
index 52beb07..f6c5040 100644
--- a/linden/indra/llmessage/llnamevalue.h
+++ b/linden/indra/llmessage/llnamevalue.h
@@ -148,8 +148,8 @@ public:
        BOOL                    sendToViewer() const;
        void                    callCallback();
-        std::string             printNameValue();
+        std::string             printNameValue() const;
-        std::string             printData();
+        std::string             printData() const;
        
        ENameValueType          getTypeEnum() const             { return mType; }
        ENameValueClass         getClassEnum() const    { return mClass; }
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index c92612f..9ce0bab 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -41,6 +41,7 @@
 #include "llapr.h"
 #include "llmemtype.h"
 #include "llstl.h"
+#include "llstat.h"
 // These should not be enabled in production, but they can be
 // intensely useful during development for finding certain kinds of
@@ -269,6 +270,13 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout)
        return true;
 }
+void LLPumpIO::adjustTimeoutSeconds(F32 delta)
+{
+        // If no chain is running, bail
+        if(current_chain_t() == mCurrentChain) return;
+        (*mCurrentChain).adjustTimeoutSeconds(delta);
+}
 static std::string events_2_string(apr_int16_t events)
 {
        std::ostringstream ostr;
@@ -514,7 +522,10 @@ void LLPumpIO::pump(const S32& poll_timeout)
                //llinfos << "polling" << llendl;
                S32 count = 0;
                S32 client_id = 0;
-                apr_pollset_poll(mPollset, poll_timeout, &count, &poll_fd);
+        {
+            LLPerfBlock polltime("pump_poll");
+            apr_pollset_poll(mPollset, poll_timeout, &count, &poll_fd);
+        }
                PUMP_DEBUG;
                for(S32 ii = 0; ii < count; ++ii)
                {
@@ -1161,3 +1172,14 @@ void LLPumpIO::LLChainInfo::setTimeoutSeconds(F32 timeout)
                mTimer.stop();
        }
 }
+void LLPumpIO::LLChainInfo::adjustTimeoutSeconds(F32 delta)
+{
+        LLMemType m1(LLMemType::MTYPE_IO_PUMP);
+        if(mTimer.getStarted())
+        {
+                F64 expiry = mTimer.expiresAt();
+                expiry += delta;
+                mTimer.setExpiryAt(expiry);
+        }
+}
diff --git a/linden/indra/llmessage/llpumpio.h b/linden/indra/llmessage/llpumpio.h
index d2392a3..daff723 100644
--- a/linden/indra/llmessage/llpumpio.h
+++ b/linden/indra/llmessage/llpumpio.h
@@ -166,6 +166,14 @@ public:
        bool setTimeoutSeconds(F32 timeout);
        /** 
+         * @brief Adjust the timeout of the running chain.
+         *
+         * This method has no effect if there is no timeout on the chain.
+         * @param delta The number of seconds to add to/remove from the timeout.
+         */
+        void adjustTimeoutSeconds(F32 delta);
+        /** 
         * @brief Set up file descriptors for for the running chain.
         * @see rebuildPollset()
         *
@@ -349,6 +357,7 @@ protected:
                // methods
                LLChainInfo();
                void setTimeoutSeconds(F32 timeout);
+                void adjustTimeoutSeconds(F32 delta);
                // basic member data
                bool mInit;
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index af010ae..46624c1 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -60,8 +60,10 @@ const U32 REGION_FLAGS_BLOCK_LAND_RESELL		= (1 << 7);
 // All content wiped once per night
 const U32 REGION_FLAGS_SANDBOX                                  = (1 << 8);
 const U32 REGION_FLAGS_NULL_LAYER                               = (1 << 9);
-const U32 REGION_FLAGS_SKIP_AGENT_ACTION                = (1 << 10);
+// const U32 REGION_FLAGS_SKIP_AGENT_ACTION             = (1 << 10);
-const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
+const U32 REGION_FLAGS_HARD_ALLOW_LAND_TRANSFER = (1 << 10);    // Region allows land reselling
+// const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
+const U32 REGION_FLAGS_HARD_ALLOW_POST_CLASSIFIED       = (1 << 11);    // Region allows posting of classified ads
 const U32 REGION_FLAGS_SKIP_COLLISIONS                  = (1 << 12); // Pin all non agent rigid bodies
 const U32 REGION_FLAGS_SKIP_SCRIPTS                             = (1 << 13);
 const U32 REGION_FLAGS_SKIP_PHYSICS                             = (1 << 14); // Skip all physics
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index ee62798..e561597 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -68,6 +68,7 @@ public:
        LLChannelDescriptors mChannels;
        U8* mLastRead;
        U32 mBodyLimit;
+        S32 mByteAccumulator;
        bool mIsBodyLimitSet;
 };
@@ -76,8 +77,8 @@ LLURLRequestDetail::LLURLRequestDetail() :
        mResponseBuffer(NULL),
        mLastRead(NULL),
        mBodyLimit(0),
+        mByteAccumulator(0),
        mIsBodyLimitSet(false)
-        
 {
        LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
        mCurlRequest = new LLCurlEasyRequest();
@@ -264,8 +265,25 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
                {
                        CURLcode result;
                        bool newmsg = mDetail->mCurlRequest->getResult(&result);
-                        if (!newmsg)
+                        if(!newmsg)
                        {
+                                // we're still waiting or prcessing, check how many
+                                // bytes we have accumulated.
+                                const S32 MIN_ACCUMULATION = 100000;
+                                if(pump && (mDetail->mByteAccumulator > MIN_ACCUMULATION))
+                                {
+                                        // This is a pretty sloppy calculation, but this
+                                        // tries to make the gross assumption that if data
+                                        // is coming in at 56kb/s, then this transfer will
+                                        // probably succeed. So, if we're accumlated
+                                        // 100,000 bytes (MIN_ACCUMULATION) then let's
+                                        // give this client another 2s to complete.
+                                        const F32 TIMEOUT_ADJUSTMENT = 2.0f;
+                                        mDetail->mByteAccumulator = 0;
+                                        pump->adjustTimeoutSeconds(TIMEOUT_ADJUSTMENT);
+                                }
+                                // keep processing
                                break;
                        }
@@ -434,6 +452,7 @@ size_t LLURLRequest::downCallback(
                req->mDetail->mChannels.out(),
                (U8*)data,
                bytes);
+        req->mDetail->mByteAccumulator += bytes;
        return bytes;
 }
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index b20731a..3ee3c03 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -3956,22 +3956,27 @@ void LLMessageSystem::getString(const char *block, const char *var,
                                  blocknum);
 }
-S32     LLMessageSystem::getNumberOfBlocksFast(const char *blockname)
+BOOL    LLMessageSystem::has(const char *blockname) const
+{
+        return getNumberOfBlocks(blockname) > 0;
+}
+S32     LLMessageSystem::getNumberOfBlocksFast(const char *blockname) const
 {
        return mMessageReader->getNumberOfBlocks(blockname);
 }
-S32     LLMessageSystem::getNumberOfBlocks(const char *blockname)
+S32     LLMessageSystem::getNumberOfBlocks(const char *blockname) const
 {
        return getNumberOfBlocksFast(LLMessageStringTable::getInstance()->getString(blockname));
 }
        
-S32     LLMessageSystem::getSizeFast(const char *blockname, const char *varname)
+S32     LLMessageSystem::getSizeFast(const char *blockname, const char *varname) const
 {
        return mMessageReader->getSize(blockname, varname);
 }
-S32     LLMessageSystem::getSize(const char *blockname, const char *varname)
+S32     LLMessageSystem::getSize(const char *blockname, const char *varname) const
 {
        return getSizeFast(LLMessageStringTable::getInstance()->getString(blockname), 
                                           LLMessageStringTable::getInstance()->getString(varname));
@@ -3979,13 +3984,13 @@ S32	LLMessageSystem::getSize(const char *blockname, const char *varname)
        
 // size in bytes of variable length data
 S32     LLMessageSystem::getSizeFast(const char *blockname, S32 blocknum, 
-                                                                 const char *varname)
+                                                                 const char *varname) const
 {
        return mMessageReader->getSize(blockname, blocknum, varname);
 }
                
 S32     LLMessageSystem::getSize(const char *blockname, S32 blocknum, 
-                                                         const char *varname)
+                                                         const char *varname) const
 {
        return getSizeFast(LLMessageStringTable::getInstance()->getString(blockname), blocknum, 
                                           LLMessageStringTable::getInstance()->getString(varname));
@@ -4021,3 +4026,18 @@ bool LLMessageSystem::checkAllMessages(S64 frame_count, LLPumpIO* http_pump)
        http_pump->callback();
        return (mPacketsIn - packetsIn) > 0;
 }
+void LLMessageSystem::banUdpMessage(const std::string& name)
+{
+        message_template_name_map_t::iterator itt = mMessageTemplates.find(
+                LLMessageStringTable::getInstance()->getString(name.c_str())
+                );
+        if(itt != mMessageTemplates.end())
+        {
+                itt->second->banUdp();
+        }
+        else
+        {
+                llwarns << "Attempted to ban an unknown message: " << name << "." << llendl;
+        }
+}
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index 8807521..b72aa9a 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -562,6 +562,9 @@ public:
        /** Return false true if name is unknown or trusted */
        bool isUntrustedMessage(const std::string& name) const;
+        // Change this message to be UDP black listed.
+        void banUdpMessage(const std::string& name);
 private:
        // A list of the circuits that need to be sent DenyTrustedCircuit messages.
        typedef std::set<LLHost> host_set_t;
@@ -591,13 +594,14 @@ public:
        LLHost  findHost(const U32 circuit_code);
        void    sanityCheck();
-        S32             getNumberOfBlocksFast(const char *blockname);
+        BOOL    has(const char *blockname) const;
-        S32             getNumberOfBlocks(const char *blockname);
+        S32             getNumberOfBlocksFast(const char *blockname) const;
-        S32             getSizeFast(const char *blockname, const char *varname);
+        S32             getNumberOfBlocks(const char *blockname) const;
-        S32             getSize(const char *blockname, const char *varname);
+        S32             getSizeFast(const char *blockname, const char *varname) const;
+        S32             getSize(const char *blockname, const char *varname) const;
        S32             getSizeFast(const char *blockname, S32 blocknum, 
-                                                const char *varname); // size in bytes of data
+                                                const char *varname) const; // size in bytes of data
-        S32             getSize(const char *blockname, S32 blocknum, const char *varname);
+        S32             getSize(const char *blockname, S32 blocknum, const char *varname) const;
        void    resetReceiveCounts();                           // resets receive counts for all message types to 0
        void    dumpReceiveCounts();                            // dumps receive count for each message type to llinfos
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 35f032a..8cd33a2 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -58,6 +58,22 @@ inline BOOL LLKeywordToken::isHead(const llwchar* s) const
        return res;
 }
+inline BOOL LLKeywordToken::isTail(const llwchar* s) const
+{
+        BOOL res = TRUE;
+        const llwchar* t = mDelimiter.c_str();
+        S32 len = mDelimiter.size();
+        for (S32 i=0; i<len; i++)
+        {
+                if (s[i] != t[i])
+                {
+                        res = FALSE;
+                        break;
+                }
+        }
+        return res;
+}
 LLKeywords::LLKeywords() : mLoaded(FALSE)
 {
 }
@@ -111,6 +127,7 @@ BOOL LLKeywords::loadFromFile( const std::string& filename )
        std::string SOL_LINE("[line ");
        std::string SOL_ONE_SIDED_DELIMITER("[one_sided_delimiter ");
        std::string SOL_TWO_SIDED_DELIMITER("[two_sided_delimiter ");
+        std::string SOL_TWO_SIDED_DELIMITER_ESC("[two_sided_delimiter_esc ");
        LLColor3 cur_color( 1, 0, 0 );
        LLKeywordToken::TOKEN_TYPE cur_type = LLKeywordToken::WORD;
@@ -142,6 +159,12 @@ BOOL LLKeywords::loadFromFile( const std::string& filename )
                        cur_type = LLKeywordToken::TWO_SIDED_DELIMITER;
                        continue;
                }
+                else if( line.find(SOL_TWO_SIDED_DELIMITER_ESC) == 0 )
+                {
+                        cur_color = readColor( line.substr(SOL_TWO_SIDED_DELIMITER_ESC.size()) );
+                        cur_type = LLKeywordToken::TWO_SIDED_DELIMITER_ESC;
+                        continue;
+                }
                else if( line.find(SOL_ONE_SIDED_DELIMITER) == 0 )      
                {
                        cur_color = readColor( line.substr(SOL_ONE_SIDED_DELIMITER.size()) );
@@ -163,6 +186,19 @@ BOOL LLKeywords::loadFromFile( const std::string& filename )
                        std::string keyword = (*token_word_iter);
                        LLStringUtil::trim(keyword);
+                        // second word may be right delimiter
+                        std::string delimiter = "";
+                        if (cur_type == LLKeywordToken::TWO_SIDED_DELIMITER || 
+                                cur_type == LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
+                        {
+                                while (delimiter.length() == 0 && ++token_word_iter != word_tokens.end())
+                                {
+                                        delimiter = *token_word_iter;
+                                        LLStringUtil::trim(delimiter);
+                                }
+                        }
                        // following words are tooltip
                        std::string tool_tip;
                        while (++token_word_iter != word_tokens.end())
@@ -175,11 +211,11 @@ BOOL LLKeywords::loadFromFile( const std::string& filename )
                        {
                                // Replace : with \n for multi-line tool tips.
                                LLStringUtil::replaceChar( tool_tip, ':', '\n' );
-                                addToken(cur_type, keyword, cur_color, tool_tip );
+                                addToken(cur_type, keyword, cur_color, tool_tip, delimiter );
                        }
                        else
                        {
-                                addToken(cur_type, keyword, cur_color, LLStringUtil::null );
+                                addToken(cur_type, keyword, cur_color, LLStringUtil::null, delimiter );
                        }
                }
        }
@@ -194,24 +230,27 @@ BOOL LLKeywords::loadFromFile( const std::string& filename )
 void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type,
                                                  const std::string& key_in,
                                                  const LLColor3& color,
-                                                  const std::string& tool_tip_in )
+                                                  const std::string& tool_tip_in,
+                                                  const std::string& delimiter_in )
 {
        LLWString key = utf8str_to_wstring(key_in);
        LLWString tool_tip = utf8str_to_wstring(tool_tip_in);
+        LLWString delimiter = utf8str_to_wstring(delimiter_in);
        switch(type)
        {
        case LLKeywordToken::WORD:
-                mWordTokenMap[key] = new LLKeywordToken(type, color, key, tool_tip);
+                mWordTokenMap[key] = new LLKeywordToken(type, color, key, tool_tip, delimiter);
                break;
        case LLKeywordToken::LINE:
-                mLineTokenList.push_front(new LLKeywordToken(type, color, key, tool_tip));
+                mLineTokenList.push_front(new LLKeywordToken(type, color, key, tool_tip, delimiter));
                break;
        case LLKeywordToken::TWO_SIDED_DELIMITER:
        case LLKeywordToken::ONE_SIDED_DELIMITER:
-                mDelimiterTokenList.push_front(new LLKeywordToken(type, color, key, tool_tip));
+        case LLKeywordToken::TWO_SIDED_DELIMITER_ESC:
-                break;
+                mDelimiterTokenList.push_front(new LLKeywordToken(type, color, key, tool_tip, delimiter));
+                break;
        default:
                llassert(0);
@@ -341,12 +380,13 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                        seg_start = cur - base;
                                        cur += cur_delimiter->getLength();
                                        
-                                        if( cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER )
+                                        if( cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER || LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
                                        {
-                                                while( *cur && !cur_delimiter->isHead(cur))
+                                                llassert( cur_delimiter->getDelimiter() != NULL );
+                                                while( *cur && !cur_delimiter->isTail(cur))
                                                {
                                                        // Check for an escape sequence.
-                                                        if (*cur == '\\')
+                                                        if (cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER_ESC && *cur == '\\')
                                                        {
                                                                // Count the number of backslashes.
                                                                S32 num_backslashes = 0;
@@ -357,7 +397,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                                                        cur++;
                                                                }
                                                                // Is the next character the end delimiter?
-                                                                if (cur_delimiter->isHead(cur))
+                                                                if (cur_delimiter->isTail(cur))
                                                                {
                                                                        // Is there was an odd number of backslashes, then this delimiter
                                                                        // does not end the sequence.
@@ -383,7 +423,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                                if( *cur )
                                                {
                                                        cur += cur_delimiter->getLength();
-                                                        seg_end = seg_start + between_delimiters + 2 * cur_delimiter->getLength();
+                                                        seg_end = seg_start + between_delimiters
+                                                                + cur_delimiter->getLength()
+                                                                + cur_delimiter->getLength2();
                                                }
                                                else
                                                {
diff --git a/linden/indra/llui/llkeywords.h b/linden/indra/llui/llkeywords.h
index e3361f6..742383a 100644
--- a/linden/indra/llui/llkeywords.h
+++ b/linden/indra/llui/llkeywords.h
@@ -45,23 +45,27 @@ class LLTextSegment;
 class LLKeywordToken
 {
 public:
-        enum TOKEN_TYPE { WORD, LINE, TWO_SIDED_DELIMITER, ONE_SIDED_DELIMITER };
+        enum TOKEN_TYPE { WORD, LINE, TWO_SIDED_DELIMITER, ONE_SIDED_DELIMITER, TWO_SIDED_DELIMITER_ESC };
-        LLKeywordToken( TOKEN_TYPE type, const LLColor3& color, const LLWString& token, const LLWString& tool_tip ) 
+        LLKeywordToken( TOKEN_TYPE type, const LLColor3& color, const LLWString& token, const LLWString& tool_tip, const LLWString& delimiter )
                :
                mType( type ),
-                mToken( token ),
+                mToken( token ),                        // keyword or left delimiter
                mColor( color ),
-                mToolTip( tool_tip )
+                mToolTip( tool_tip ),
+                mDelimiter( delimiter )         // right delimiter
        {
        }
        S32                                     getLength() const               { return mToken.size(); }
+        S32                                     getLength2() const              { return mDelimiter.size(); }
        BOOL                            isHead(const llwchar* s) const;
+        BOOL                            isTail(const llwchar* s) const;
        const LLWString&        getToken() const                { return mToken; }
        const LLColor3&         getColor() const                { return mColor; }
        TOKEN_TYPE                      getType()  const                { return mType; }
        const LLWString&        getToolTip() const              { return mToolTip; }
+        const LLWString&        getDelimiter() const    { return mDelimiter; }
 #ifdef _DEBUG
        void            dump();
@@ -72,6 +76,7 @@ private:
        LLWString       mToken;
        LLColor3        mColor;
        LLWString       mToolTip;
+        LLWString       mDelimiter;
 };
 class LLKeywords
@@ -89,7 +94,8 @@ public:
        void addToken(LLKeywordToken::TOKEN_TYPE type,
                                        const std::string& key,
                                        const LLColor3& color,
-                                        const std::string& tool_tip = LLStringUtil::null);
+                                        const std::string& tool_tip = LLStringUtil::null,
+                                        const std::string& delimiter = LLStringUtil::null);
        typedef std::map<LLWString, LLKeywordToken*> word_token_map_t;
        typedef word_token_map_t::const_iterator keyword_iterator_t;
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 12d1929..9c8ee94 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -41,6 +41,7 @@
 #include "llgl.h"
 #include "lltimer.h"
+#include "llcalc.h"
 //#include "llclipboard.h"
 #include "llcontrol.h"
 #include "llbutton.h"
@@ -129,6 +130,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                mDrawAsterixes( FALSE ),
                mHandleEditKeysDirectly( FALSE ),
                mSelectAllonFocusReceived( FALSE ),
+                mSelectAllonCommit( TRUE ),
                mPassDelete(FALSE),
                mReadOnly(FALSE),
                mImage( sImage ),
@@ -226,7 +228,10 @@ void LLLineEditor::onCommit()
        updateHistory();
        LLUICtrl::onCommit();
-        selectAll();
+        // Selection on commit needs to be turned off when evaluating maths
+        // expressions, to allow indication of the error position
+        if (mSelectAllonCommit) selectAll();
 }
@@ -2082,6 +2087,32 @@ BOOL LLLineEditor::prevalidateASCII(const LLWString &str)
        return rv;
 }
+BOOL LLLineEditor::evaluateFloat()
+{
+        bool success;
+        F32 result = 0.f;
+        std::string expr = getText();
+        success = LLCalc::getInstance()->evalString(expr, result);
+        if (!success)
+        {
+                // Move the cursor to near the error on failure
+                setCursor(LLCalc::getInstance()->getLastErrorPos());
+                // *TODO: Translated error message indicating the type of error? Select error text?
+        }
+        else
+        {
+                // Replace the expression with the result
+                std::ostringstream result_str;
+                result_str << result;
+                setText(result_str.str());
+                selectAll();
+        }
+        return success;
+}
 void LLLineEditor::onMouseCaptureLost()
 {
        endSelection();
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 09a240b..6738151 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -188,6 +188,7 @@ public:
        void                    setHandleEditKeysDirectly( BOOL b ) { mHandleEditKeysDirectly = b; }
        void                    setSelectAllonFocusReceived(BOOL b);
+        void                    setSelectAllonCommit(BOOL b) { mSelectAllonCommit = b; }
        void                    setKeystrokeCallback(void (*keystroke_callback)(LLLineEditor* caller, void* user_data));
@@ -208,6 +209,8 @@ public:
        static BOOL             prevalidateASCII(const LLWString &str);
        static BOOL             postvalidateFloat(const std::string &str);
+        
+        BOOL                    evaluateFloat();
        // line history support:
        void                    setEnableLineHistory( BOOL enabled ) { mHaveHistory = enabled; } // switches line history on or off 
@@ -297,6 +300,7 @@ protected:
        BOOL            mHandleEditKeysDirectly;  // If true, the standard edit keys (Ctrl-X, Delete, etc,) are handled here instead of routed by the menu system
        BOOL            mSelectAllonFocusReceived;
+        BOOL            mSelectAllonCommit;
        BOOL            mPassDelete;
        BOOL            mReadOnly;
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index a106af4..b12d095 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -49,7 +49,7 @@
 #include "llfocusmgr.h"
 #include "llresmgr.h"
-const U32 MAX_STRING_LENGTH = 32;
+const U32 MAX_STRING_LENGTH = 255;
 static LLRegisterWidget<LLSpinCtrl> r2("spinner");
 
@@ -123,7 +123,7 @@ LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::
        mEditor = new LLLineEditor( std::string("SpinCtrl Editor"), editor_rect, LLStringUtil::null, font,
                                                                MAX_STRING_LENGTH,
                                                                &LLSpinCtrl::onEditorCommit, NULL, NULL, this,
-                                                                &LLLineEditor::prevalidateFloat );
+                                                                &LLLineEditor::prevalidateASCII );
        mEditor->setFollowsLeft();
        mEditor->setFollowsBottom();
        mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus, this );
@@ -132,6 +132,7 @@ LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::
        // it's easier to understand
        //mEditor->setSelectAllonFocusReceived(TRUE);
        mEditor->setIgnoreTab(TRUE);
+        mEditor->setSelectAllonCommit(FALSE);
        addChild(mEditor);
        updateEditor();
@@ -292,9 +293,10 @@ void LLSpinCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
        LLSpinCtrl* self = (LLSpinCtrl*) userdata;
        llassert( caller == self->mEditor );
-        std::string text = self->mEditor->getText();
+        if( self->mEditor->evaluateFloat() )
-        if( LLLineEditor::postvalidateFloat( text ) )
        {
+                std::string text = self->mEditor->getText();
+                
                LLLocale locale(LLLocale::USER_LOCALE);
                F32 val = (F32) atof(text.c_str());
@@ -322,9 +324,12 @@ void LLSpinCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
                        success = TRUE;
                }
        }
-        self->updateEditor();
-        if( !success )
+        if( success )
+        {
+                self->updateEditor();
+        }
+        else
        {
                self->reportInvalidData();              
        }
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 3e62195..2616b47 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -36,7 +36,8 @@ FS			(f|F)
 #include "llclickaction.h"
 void count();
-void comment();
+void line_comment();
+void block_comment();
 void parse_string();
 #define YYLMAX 16384
@@ -60,7 +61,8 @@ extern "C" { int yyerror(const char *fmt, ...); }
 %}
 %%
-"//"                                    { gInternalLine++; gInternalColumn = 0; comment(); }
+"//"                                    { gInternalLine++; gInternalColumn = 0; line_comment(); }
+"/*"                                    { block_comment(); }
 "integer"                       { count(); return(INTEGER); }
 "float"                         { count(); return(FLOAT_TYPE); }
@@ -790,7 +792,7 @@ S32 yywrap()
        return(1);
 }
-void comment()
+void line_comment()
 {
        char c;
@@ -798,6 +800,25 @@ void comment()
                ;
 }
+void block_comment()
+{
+        char c1 = 0;
+        char c2 = yyinput();
+        while (c2 != 0 && c2 != EOF && !(c1 == '*' && c2 == '/')) {
+                if (c2 == '\n')
+                {
+                        gInternalLine++;
+                        gInternalColumn = 0;
+                }
+                else if (c2 == '\t')
+                        gInternalColumn += 4 - (gInternalColumn % 8);
+                else
+                        gInternalColumn++;
+                c1 = c2;
+                c2 = yyinput();
+        }
+}
 void count()
 {
        S32 i;
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 3679c38..2a911ba 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -533,7 +533,6 @@ SQRT2				1.4142135623730950488016887242097
 ZERO_VECTOR                     <0.0, 0.0, 0.0>
 ZERO_ROTATION           <0.0, 0.0, 0.0, 1.0>
 # flow control keywords
 [word 0, 0, .8]
 for                                     for loop:for (initializer; test; iteration):{:   statements:}
@@ -551,9 +550,11 @@ return				Leave current function or event handler
 # Comment
 [one_sided_delimiter .8, .3, .15]
 //                                      Comment:Non-functional commentary or disabled code
+[two_sided_delimiter .8, .3, .15]
+/* */                                   Comment:Non-functional commentary or disabled code
 # String literals
-[two_sided_delimiter 0, .2, 0]
+[two_sided_delimiter_esc 0, .2, 0]
-"                                       String literal
+" "                                     String literal
-#functions are supplied by the program now.
+#functions are supplied by the program now.
+\ No newline at end of file
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7e591bf..01f6add 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1849,17 +1849,6 @@
        <integer>0</integer>
      </array>
    </map>
-    <key>CompressSnapshotsToDisk</key>
-    <map>
-      <key>Comment</key>
-      <string>Compress snapshots saved to disk (Using JPEG 2000)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
    <key>ConnectAsGod</key>
    <map>
      <key>Comment</key>
@@ -4387,7 +4376,7 @@
      <key>Type</key>
      <string>Boolean</string>
      <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
    </map>
    <key>LipSyncOoh</key>
    <map>
@@ -4730,6 +4719,17 @@
      <key>Value</key>
      <integer>1</integer>
    </map>
+    <key>MiniMapTeleport</key>
+    <map>
+            <key>Comment</key>
+            <string>Teleport on Mini-Map double click </string>
+            <key>Persist</key>
+            <integer>1</integer>
+            <key>Type</key>
+            <string>Boolean</string>
+            <key>Value</key>
+            <integer>1</integer>
+    </map>
    <key>MiniMapScale</key>
    <map>
      <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2cf418e..9e68078 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -109,6 +109,7 @@
 #include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "llcalc.h"
 #include "lldebugview.h"
 #include "llconsole.h"
@@ -1176,6 +1177,8 @@ bool LLAppViewer::cleanup()
        LLNotifyBox::cleanup();
        LLWorldMap::getInstance()->reset(); // release any images
+        LLCalc::cleanUp();
        
        llinfos << "Global stuff deleted" << llendflush;
@@ -1602,7 +1605,7 @@ bool LLAppViewer::initConfiguration()
        // - set procedural settings 
        gSavedSettings.setString("ClientSettingsFile", 
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
        gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 954bf9f..6e66103 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -992,6 +992,7 @@ public:
        static void onClickLess(void* data) ;
        static void onClickMore(void* data) ;
        static void onClickUICheck(LLUICtrl *ctrl, void* data);
+        static void onClickHighResCheck(LLUICtrl *ctrl, void* data);
        static void onClickHUDCheck(LLUICtrl *ctrl, void* data);
        static void onClickKeepOpenCheck(LLUICtrl *ctrl, void* data);
        static void onClickKeepAspectCheck(LLUICtrl *ctrl, void* data);
@@ -1105,6 +1106,10 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 {
        LLSnapshotLivePreview* previewp = getPreviewView(floaterp);
+        LLSnapshotLivePreview::ESnapshotType shot_type = getTypeIndex(floaterp);
+        if (shot_type != LLSnapshotLivePreview::SNAPSHOT_LOCAL)
+                gSavedSettings.setBOOL("HighResSnapshot", FALSE);
        S32 delta_height = gSavedSettings.getBOOL("AdvanceSnapshot") ? 0 : floaterp->getUIWinHeightShort() - floaterp->getUIWinHeightLong() ;
        LLComboBox* combo;
@@ -1234,6 +1239,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
        floater->childSetVisible("snapshot_height",                     is_advance);
        floater->childSetVisible("keep_aspect_check",           is_advance);
        floater->childSetVisible("ui_check",                            is_advance);
+        floater->childSetVisible("high_res_check",                      is_advance && is_local);
        floater->childSetVisible("hud_check",                           is_advance);
        floater->childSetVisible("keep_open_check",                     is_advance);
        floater->childSetVisible("freeze_frame_check",          is_advance);
@@ -1246,7 +1252,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
                layer_type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
                floater->childSetValue("layer_types", "colors");
                if(is_advance)
-                {                       
+                {
                        setResolution(floater, "postcard_size_combo");
                }
                break;
@@ -1434,7 +1440,26 @@ void LLFloaterSnapshot::Impl::onClickUICheck(LLUICtrl *ctrl, void* data)
        
        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
        if (view)
+        {       
+                BOOL high_res_snapshot = gSavedSettings.getBOOL("HighResSnapshot");
+                if (high_res_snapshot) gSavedSettings.setBOOL("HighResSnapshot", FALSE);
+                view->childSetEnabled("high_res_check", !check->get());
+                checkAutoSnapshot(getPreviewView(view), TRUE);
+        }
+}
+// static
+void LLFloaterSnapshot::Impl::onClickHighResCheck(LLUICtrl *ctrl, void* data)
+{
+        LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
+        gSavedSettings.setBOOL( "HighResSnapshot", check->get() );
+        
+        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
+        if (view)
        {
+                BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot");
+                if (ui_in_snapshot) gSavedSettings.setBOOL("RenderUIInSnapshot", FALSE);
+                view->childSetEnabled("ui_check", !check->get());
                checkAutoSnapshot(getPreviewView(view), TRUE);
        }
 }
@@ -1912,6 +1937,9 @@ BOOL LLFloaterSnapshot::postBuild()
        childSetCommitCallback("ui_check", Impl::onClickUICheck, this);
+        childSetCommitCallback("high_res_check", Impl::onClickHighResCheck, this);
+        childSetValue("high_res_check", gSavedSettings.getBOOL("HighResSnapshot"));
        childSetCommitCallback("hud_check", Impl::onClickHUDCheck, this);
        childSetValue("hud_check", gSavedSettings.getBOOL("RenderHUDInSnapshot"));
@@ -2001,8 +2029,23 @@ void LLFloaterSnapshot::draw()
                        childSetEnabled("send_btn", FALSE);
                        childSetEnabled("save_btn", FALSE);
                }
+                
                BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot");
+                if (previewp->getSnapshotType() != LLSnapshotLivePreview::SNAPSHOT_LOCAL)
+                {
+                        childSetValue("high_res_check", FALSE);
+                        childSetEnabled("ui_check", TRUE);
+                }
+                else
+                {
+                        if (ui_in_snapshot)
+                        {
+                                gSavedSettings.setBOOL("HighResSnapshot", FALSE);
+                                childSetEnabled("high_res_check", FALSE);
+                        }
+                }
                childSetValue("ui_check", ui_in_snapshot);
                childSetToolTip("ui_check", std::string("If selected shows the UI in the snapshot"));
        }
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index b56bfcb..8396454 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -743,7 +743,7 @@ void LLFloaterWorldMap::updateLocation()
 void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
        LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
-        z_coord = llclamp(z_coord, 0, 1000);
+        z_coord = llclamp(z_coord, 0, 4096);
        if (sim_info)
        {
                LLVector3 local_pos;
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index bde36cc..34277f7 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -756,6 +756,10 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
                model->deleteObject(mUUID);
                model->notifyObservers();
        }
+        else if ("restoreToWorld" == action)
+        {
+                restoreToWorld();
+        }
        else if ("restore" == action)
        {
                restoreItem();
@@ -812,6 +816,47 @@ void LLItemBridge::restoreItem()
        }
 }
+void LLItemBridge::restoreToWorld()
+{
+        LLViewerInventoryItem* itemp = (LLViewerInventoryItem*)getItem();
+        if (itemp)
+        {
+                LLMessageSystem* msg = gMessageSystem;
+                msg->newMessage("RezRestoreToWorld");
+                msg->nextBlockFast(_PREHASH_AgentData);
+                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                msg->nextBlockFast(_PREHASH_InventoryData);
+                itemp->packMessage(msg);
+                msg->sendReliable(gAgent.getRegion()->getHost());
+        }
+        //Similar functionality to the drag and drop rez logic
+        BOOL remove_from_inventory = FALSE;
+        //remove local inventory copy, sim will deal with permissions and removing the item
+        //from the actual inventory if its a no-copy etc
+        if(!itemp->getPermissions().allowCopyBy(gAgent.getID()))
+        {
+                remove_from_inventory = TRUE;
+        }
+        // Check if it's in the trash. (again similar to the normal rez logic)
+        LLUUID trash_id;
+        trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
+        if(gInventory.isObjectDescendentOf(itemp->getUUID(), trash_id))
+        {
+                remove_from_inventory = TRUE;
+        }
+        if(remove_from_inventory)
+        {
+                gInventory.deleteObject(itemp->getUUID());
+                gInventory.notifyObservers();
+        }
+}
 LLUIImagePtr LLItemBridge::getIcon() const
 {
        return LLUI::getUIImage(ICON_NAME[OBJECT_ICON_NAME]);
@@ -3376,6 +3421,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                items.push_back(std::string("Object Wear"));
                                items.push_back(std::string("Attach To"));
                                items.push_back(std::string("Attach To HUD"));
+                                items.push_back(std::string("Restore to Last Position"));
                                LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE);
                                LLMenuGL* attach_hud_menu = menu.getChildMenuByName("Attach To HUD", TRUE);
@@ -4364,7 +4410,6 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                items.push_back(std::string("Wearable Wear"));
                items.push_back(std::string("Wearable Edit"));
                if ((flags & FIRST_SELECTED_ITEM) == 0)
                {
                        disabled_items.push_back(std::string("Wearable Edit"));
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 329e57f..eb17432 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -159,6 +159,7 @@ public:
        virtual const std::string& getPrefix() { return LLStringUtil::null; }
        virtual void restoreItem() {}
+        virtual void restoreToWorld() {}
        // LLFolderViewEventListener functions
        virtual const std::string& getName() const;
@@ -243,6 +244,7 @@ public:
        virtual void selectItem();
        virtual void restoreItem();
+        virtual void restoreToWorld();
        virtual LLUIImagePtr getIcon() const;
        virtual const std::string& getDisplayName() const;
@@ -283,7 +285,6 @@ public:
        virtual void selectItem();
        virtual void restoreItem();
        virtual LLUIImagePtr getIcon() const;
        virtual BOOL renameItem(const std::string& new_name);
        virtual BOOL removeItem();
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index b1e3017..73f0fb3 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -73,7 +73,6 @@ F32  LLInventoryModel::sMinTimeBetweenFetches = 0.3f;
 F32  LLInventoryModel::sMaxTimeBetweenFetches = 10.f;
 BOOL LLInventoryModel::sTimelyFetchPending = FALSE;
 LLFrameTimer LLInventoryModel::sFetchTimer;
-LLInventoryModel::cat_map_t LLInventoryModel::sBulkFetchMap;
 S16 LLInventoryModel::sBulkFetchCount = 0;
 // RN: for some reason, using std::queue in the header file confuses the compiler which things it's an xmlrpc_queue
@@ -85,7 +84,7 @@ static std::deque<LLUUID> sFetchQueue;
 //BOOL decompress_file(const char* src_filename, const char* dst_filename);
 const F32 MAX_TIME_FOR_SINGLE_FETCH = 10.f;
-const S32 MAX_FETCH_RETRIES = 5;
+const S32 MAX_FETCH_RETRIES = 10;
 const char CACHE_FORMAT_STRING[] = "%s.inv"; 
 const char* NEW_CATEGORY_NAME = "New Folder";
 const char* NEW_CATEGORY_NAMES[LLAssetType::AT_COUNT] =
@@ -990,13 +989,24 @@ BOOL LLInventoryModel::containsObserver(LLInventoryObserver* observer)
 // Call this method when it's time to update everyone on a new state,
 // by default, the inventory model will not update observers
 // automatically.
-void LLInventoryModel::notifyObservers()
+// The optional argument 'service_name' is used by Agent Inventory Service [DEV-20328]
+void LLInventoryModel::notifyObservers(const std::string service_name)
 {
        for (observer_list_t::iterator iter = mObservers.begin();
                 iter != mObservers.end(); )
        {
                LLInventoryObserver* observer = *iter;
-                observer->changed(mModifyMask);
+                
+                if (service_name.empty())
+                {
+                        observer->changed(mModifyMask);
+                }
+                else
+                {
+                        observer->mMessageName = service_name;
+                        observer->changed(mModifyMask);
+                }
                // safe way to incrament since changed may delete entries! (@!##%@!@&*!)
                iter = mObservers.upper_bound(observer); 
        }
@@ -1038,6 +1048,79 @@ void LLInventoryModel::mock(const LLUUID& root_id)
 }
 */
+//If we get back a normal response, handle it here
+void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
+{       
+        start_new_inventory_observer();
+        /*LLUUID agent_id;
+        agent_id = content["agent_id"].asUUID();
+        if(agent_id != gAgent.getID())
+        {
+                llwarns << "Got a inventory update for the wrong agent: " << agent_id
+                                << llendl;
+                return;
+        }*/
+        item_array_t items;
+        update_map_t update;
+        S32 count = content["items"].size();
+        bool all_one_folder = true;
+        LLUUID folder_id;
+        // Does this loop ever execute more than once? -Gigs
+        for(S32 i = 0; i < count; ++i)
+        {
+                LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
+                titem->unpackMessage(content["items"][i]);
+                
+                lldebugs << "LLInventoryModel::messageUpdateCore() item id:"
+                                 << titem->getUUID() << llendl;
+                items.push_back(titem);
+                // examine update for changes.
+                LLViewerInventoryItem* itemp = gInventory.getItem(titem->getUUID());
+                if(itemp)
+                {
+                        if(titem->getParentUUID() == itemp->getParentUUID())
+                        {
+                                update[titem->getParentUUID()];
+                        }
+                        else
+                        {
+                                ++update[titem->getParentUUID()];
+                                --update[itemp->getParentUUID()];
+                        }
+                }
+                else
+                {
+                        ++update[titem->getParentUUID()];
+                }
+                if (folder_id.isNull())
+                {
+                        folder_id = titem->getParentUUID();
+                }
+                else
+                {
+                        all_one_folder = false;
+                }
+        }
+        U32 changes = 0x0;
+        //as above, this loop never seems to loop more than once per call
+        for (item_array_t::iterator it = items.begin(); it != items.end(); ++it)
+        {
+                changes |= gInventory.updateItem(*it);
+        }
+        gInventory.notifyObservers("fetchinventory");
+        gViewerWindow->getWindow()->decBusyCount();
+}
+//If we get back an error (not found, etc...), handle it here
+void LLInventoryModel::fetchInventoryResponder::error(U32 status, const std::string& reason)
+{
+        llinfos << "fetchInventory::error "
+                << status << ": " << reason << llendl;
+        gInventory.notifyObservers("fetchinventory");
+}
 void LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id)
 {
        LLViewerInventoryCategory* cat = getCategory(folder_id);
@@ -1065,21 +1148,31 @@ void LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id)
 }
 //Initialize statics.
-LLAlertDialog* LLInventoryModel::fetchDescendentsResponder::sRetryDialog=NULL;
-LLSD LLInventoryModel::fetchDescendentsResponder::sRetrySD;
 bool LLInventoryModel::isBulkFetchProcessingComplete()
 {
        return ( (sFetchQueue.empty() 
-                        && sBulkFetchMap.empty() 
+                        && sBulkFetchCount<=0)  ?  TRUE : FALSE ) ;
-                        && sBulkFetchCount==0)  ?  TRUE : FALSE ) ;
 }
+class fetchDescendentsResponder: public LLHTTPClient::Responder
+{
+        public:
+                fetchDescendentsResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
+                //fetchDescendentsResponder() {};
+                void result(const LLSD& content);
+                void error(U32 status, const std::string& reason);
+        public:
+                typedef std::vector<LLViewerInventoryCategory*> folder_ref_t;
+        protected:
+                LLSD mRequestSD;
+};
 //If we get back a normal response, handle it here
-void  LLInventoryModel::fetchDescendentsResponder::result(const LLSD& content)
+void  fetchDescendentsResponder::result(const LLSD& content)
-{       
+{
        if (content.has("folders"))     
        {
                for(LLSD::array_const_iterator folder_it = content["folders"].beginArray();
                        folder_it != content["folders"].endArray();
                        ++folder_it)
@@ -1087,19 +1180,54 @@ void  LLInventoryModel::fetchDescendentsResponder::result(const LLSD& content)
                        LLSD folder_sd = *folder_it;
                        
-                        LLUUID agent_id = folder_sd["agent-id"];
+                        //LLUUID agent_id = folder_sd["agent_id"];
-                        if(agent_id != gAgent.getID())  //This should never happen.
+                        //if(agent_id != gAgent.getID())        //This should never happen.
-                        {
+                        //{
-                                llwarns << "Got a UpdateInventoryItem for the wrong agent."
+                        //      llwarns << "Got a UpdateInventoryItem for the wrong agent."
-                                                << llendl;
+                        //                      << llendl;
-                                break;
+                        //      break;
-                        }
+                        //}
-                        LLUUID parent_id = folder_sd["folder-id"];
-                        LLUUID owner_id = folder_sd["owner-id"];
+                        LLUUID parent_id = folder_sd["folder_id"];
+                        LLUUID owner_id = folder_sd["owner_id"];
                        S32    version  = (S32)folder_sd["version"].asInteger();
                        S32    descendents = (S32)folder_sd["descendents"].asInteger();
                        LLPointer<LLViewerInventoryCategory> tcategory = new LLViewerInventoryCategory(owner_id);
+            if (parent_id.isNull())
+            {
+                            LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
+                            for(LLSD::array_const_iterator item_it = folder_sd["items"].beginArray();
+                                    item_it != folder_sd["items"].endArray();
+                                    ++item_it)
+                            {   
+                    LLUUID lost_uuid = gInventory.findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
+                    if (lost_uuid.notNull())
+                    {
+                                        LLSD item = *item_it;
+                                        titem->unpackMessage(item);
+                                
+                        LLInventoryModel::update_list_t update;
+                        LLInventoryModel::LLCategoryUpdate new_folder(lost_uuid, 1);
+                        update.push_back(new_folder);
+                        gInventory.accountForUpdate(update);
+                        titem->setParent(lost_uuid);
+                        titem->updateParentOnServer(FALSE);
+                        gInventory.updateItem(titem);
+                        gInventory.notifyObservers("fetchDescendents");
+                        
+                    }
+                }
+            }
+                LLViewerInventoryCategory* pcat = gInventory.getCategory(parent_id);
+                        if (!pcat)
+                        {
+                                continue;
+                        }
                        for(LLSD::array_const_iterator category_it = folder_sd["categories"].beginArray();
                                category_it != folder_sd["categories"].endArray();
                                ++category_it)
@@ -1107,7 +1235,7 @@ void  LLInventoryModel::fetchDescendentsResponder::result(const LLSD& content)
                                LLSD category = *category_it;
                                tcategory->fromLLSD(category); 
                                                        
-                                if (sFullFetchStarted)
+                                if (LLInventoryModel::sFullFetchStarted)
                                {
                                        sFetchQueue.push_back(tcategory->getUUID());
                                }
@@ -1139,37 +1267,37 @@ void  LLInventoryModel::fetchDescendentsResponder::result(const LLSD& content)
                }
        }
                
-        if (content.has("bad-folders"))
+        if (content.has("bad_folders"))
        {
-                for(LLSD::array_const_iterator folder_it = content["bad-folders"].beginArray();
+                for(LLSD::array_const_iterator folder_it = content["bad_folders"].beginArray();
-                        folder_it != content["bad-folders"].endArray();
+                        folder_it != content["bad_folders"].endArray();
                        ++folder_it)
                {       
                        LLSD folder_sd = *folder_it;
                        
                        //These folders failed on the dataserver.  We probably don't want to retry them.
-                        llinfos << "Folder " << folder_sd["folder-id"].asString() 
+                        llinfos << "Folder " << folder_sd["folder_id"].asString() 
                                        << "Error: " << folder_sd["error"].asString() << llendl;
                }
        }
        LLInventoryModel::incrBulkFetch(-1);
        
-        if (isBulkFetchProcessingComplete())
+        if (LLInventoryModel::isBulkFetchProcessingComplete())
        {
                llinfos << "Inventory fetch completed" << llendl;
-                if (sFullFetchStarted)
+                if (LLInventoryModel::sFullFetchStarted)
                {
-                        sAllFoldersFetched = TRUE;
+                        LLInventoryModel::sAllFoldersFetched = TRUE;
                }
-                stopBackgroundFetch();
+                LLInventoryModel::stopBackgroundFetch();
        }
        
-        gInventory.notifyObservers();
+        gInventory.notifyObservers("fetchDescendents");
 }
 //If we get back an error (not found, etc...), handle it here
-void LLInventoryModel::fetchDescendentsResponder::error(U32 status, const std::string& reason)
+void fetchDescendentsResponder::error(U32 status, const std::string& reason)
 {
        llinfos << "fetchDescendentsResponder::error "
                << status << ": " << reason << llendl;
@@ -1183,61 +1311,22 @@ void LLInventoryModel::fetchDescendentsResponder::error(U32 status, const std::s
                        ++folder_it)
                {       
                        LLSD folder_sd = *folder_it;
-                        sRetrySD["folders"].append(folder_sd);
+                        LLUUID folder_id = folder_sd["folder_id"];
-                }
+                        sFetchQueue.push_front(folder_id);
-                sMinTimeBetweenFetches = 10.0f; //Add 10 seconds for every time out in this sequence.
-                
-                if (!sRetryDialog)                      //The dialog isn't up.  Prompt the resident.
-                {
-                        sRetryDialog = gViewerWindow->alertXml("RetryFetchInventoryDescendents", onClickRetry, this);
                }
        }
        else
        {
-                if (isBulkFetchProcessingComplete())
+                if (LLInventoryModel::isBulkFetchProcessingComplete())
                {
-                        if (sFullFetchStarted)
+                        if (LLInventoryModel::sFullFetchStarted)
                        {
-                                sAllFoldersFetched = TRUE;
+                                LLInventoryModel::sAllFoldersFetched = TRUE;
                        }
-                        stopBackgroundFetch();
+                        LLInventoryModel::stopBackgroundFetch();
                }
        }
-        gInventory.notifyObservers();
+        gInventory.notifyObservers("fetchDescendents");
-}
-void LLInventoryModel::fetchDescendentsResponder::onClickRetry(S32 option, void* userdata)
-{
-        if (option == 0)
-        {
-                std::string url;
-                LLViewerRegion * agent_region = gAgent.getRegion();
-                if (agent_region)
-                {
-                        url = agent_region->getCapability("FetchInventoryDescendents");
-                }
-                if (!url.empty()) //Capability found.  Build up LLSD and use it.
-                {
-                        LLSD body = sRetrySD;
-                        LLInventoryModel::incrBulkFetch(1);
-                        LLHTTPClient::post(url, body, new LLInventoryModel::fetchDescendentsResponder(body),300);
-                }
-        }
-        else
-        {
-                if (isBulkFetchProcessingComplete())
-                {
-                        if (sFullFetchStarted)
-                        {
-                                sAllFoldersFetched = TRUE;
-                        }
-                        stopBackgroundFetch();
-                }
-        }
-        sRetryDialog=NULL;
-        sRetrySD.clear();
 }
 //static   Bundle up a bunch of requests to send all at once.
@@ -1250,7 +1339,7 @@ void LLInventoryModel::bulkFetch(std::string url)
        S16 max_concurrent_fetches=8;
        F32 new_min_time = 0.5f;                        //HACK!  Clean this up when old code goes away entirely.
-        if (sMinTimeBetweenFetches <= new_min_time) sMinTimeBetweenFetches=new_min_time;  //HACK!  See above.
+        if (sMinTimeBetweenFetches < new_min_time) sMinTimeBetweenFetches=new_min_time;  //HACK!  See above.
        
        if(gDisconnected 
        || sBulkFetchCount > max_concurrent_fetches
@@ -1263,84 +1352,83 @@ void LLInventoryModel::bulkFetch(std::string url)
        //redundant requests.  When we get rid of the old code entirely, we can change
        //the dequeue to a map.  In the new model, there is no benefit to queue order.
        U32 folder_count=0;
-        U32 max_batch_size=10;
+        U32 max_batch_size=5;
-        while( !(sFetchQueue.empty() ) )
-        {
+        U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
-                LLViewerInventoryCategory* cat = gInventory.getCategory(sFetchQueue.front());
-                
+        LLSD body;
-                if (cat)
+        LLSD body_lib;
-                {
+        while( !(sFetchQueue.empty() ) && (folder_count < max_batch_size) )
-                        if ( !gInventory.isCategoryComplete(cat->getUUID()) )   //grab this folder.
+        {
-                        {
+        if (sFetchQueue.front().isNull()) //DEV-17797
-                                sBulkFetchMap[(cat->getUUID())] = cat;
+        {
-                        }
+                        LLSD folder_sd;
-                        else if (sFullFetchStarted)
+                        folder_sd["folder_id"]          = LLUUID::null.asString();
-                        {       //Already have this folder but append child folders to list.
+                        folder_sd["owner_id"]           = gAgent.getID();
-                                // add all children to queue
+                        folder_sd["sort_order"]         = (LLSD::Integer)sort_order;
-                                parent_cat_map_t::iterator cat_it = gInventory.mParentChildCategoryTree.find(cat->getUUID());
+                        folder_sd["fetch_folders"]      = (LLSD::Boolean)FALSE;
-                                if (cat_it != gInventory.mParentChildCategoryTree.end())
+                        folder_sd["fetch_items"]        = (LLSD::Boolean)TRUE;
-                                {
+                        body["folders"].append(folder_sd);
-                                        cat_array_t* child_categories = cat_it->second;
+            folder_count++;
+        }
-                                        for (S32 child_num = 0; child_num < child_categories->count(); child_num++)
+        else
-                                        {
+        {
-                                                sFetchQueue.push_back(child_categories->get(child_num)->getUUID());
+                                
-                                        }
-                                }
-                        }
+                    LLViewerInventoryCategory* cat = gInventory.getCategory(sFetchQueue.front());
-                }
+                
+                    if (cat)
+                    {
+                            if ( LLViewerInventoryCategory::VERSION_UNKNOWN == cat->getVersion())
+                            {
+                                    LLSD folder_sd;
+                                    folder_sd["folder_id"]              = cat->getUUID();
+                                    folder_sd["owner_id"]               = cat->getOwnerID();
+                                    folder_sd["sort_order"]             = (LLSD::Integer)sort_order;
+                                    folder_sd["fetch_folders"]  = TRUE; //(LLSD::Boolean)sFullFetchStarted;
+                                    folder_sd["fetch_items"]    = (LLSD::Boolean)TRUE;
+                                    
+                                    if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID())
+                                            body_lib["folders"].append(folder_sd);
+                                    else
+                                            body["folders"].append(folder_sd);
+                                    folder_count++;
+                            }
+                            if (sFullFetchStarted)
+                            {   //Already have this folder but append child folders to list.
+                                    // add all children to queue
+                                    parent_cat_map_t::iterator cat_it = gInventory.mParentChildCategoryTree.find(cat->getUUID());
+                                    if (cat_it != gInventory.mParentChildCategoryTree.end())
+                                    {
+                                            cat_array_t* child_categories = cat_it->second;
+    
+                                            for (S32 child_num = 0; child_num < child_categories->count(); child_num++)
+                                            {
+                                                    sFetchQueue.push_back(child_categories->get(child_num)->getUUID());
+                                            }
+                                    }
+    
+                            }
+                    }
+        }
                sFetchQueue.pop_front();
        }
                
-        if (!sBulkFetchMap.empty())     //There's stuff to fetch.
-        {
-                U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
-                LLSD body;
-                
-                cat_map_t::iterator iter=sBulkFetchMap.begin();
-                while( iter!=sBulkFetchMap.end() && (folder_count < max_batch_size) )
-                {
-                        LLViewerInventoryCategory* cat = iter->second;
-                        
-                        if (cat && !gInventory.isCategoryComplete(cat->getUUID()) )     //Category exists
-                        {
-                                BOOL fetchItems=TRUE;
-                                if ( sFullFetchStarted 
-                                        && gInventory.isCategoryComplete(cat->getUUID()) )
-                                {
-                                        fetchItems=FALSE;
-                                }
-                                
-                                LLSD folder_sd;
-                                folder_sd["folder-id"]          = cat->getUUID();
-                                folder_sd["owner-id"]           = cat->getOwnerID();
-                                folder_sd["sort-order"]         = (LLSD::Integer)sort_order;
-                                folder_sd["fetch-folders"]      = (LLSD::Boolean)sFullFetchStarted;
-                                folder_sd["fetch-items"]        = (LLSD::Boolean)fetchItems;
-                                body["folders"].append(folder_sd);
-                                folder_count++;
-                        }
-                        sBulkFetchMap.erase(iter);
-                        iter=sBulkFetchMap.begin();
-                }
-        
-                if (iter == sBulkFetchMap.end()) sBulkFetchMap.clear();
-                
                if (folder_count > 0)
                {
                        sBulkFetchCount++;
-                        
+                        if (body["folders"].size())
-                        LLHTTPClient::post(url, body, new LLInventoryModel::fetchDescendentsResponder(body));
+                        {
+                                LLHTTPClient::post(url, body, new fetchDescendentsResponder(body),300.0);
+                        }
+                        if (body_lib["folders"].size())
+                        {
+                                std::string url_lib = gAgent.getRegion()->getCapability("FetchLibDescendents");
+                                LLHTTPClient::post(url_lib, body_lib, new fetchDescendentsResponder(body_lib),300.0);
+                        }
                        sFetchTimer.reset();
                }
-                
+        else if (isBulkFetchProcessingComplete())
-        }       
-        
-        if (isBulkFetchProcessingComplete())
        {
                if (sFullFetchStarted)
                {
@@ -1391,6 +1479,14 @@ void LLInventoryModel::startBackgroundFetch(const LLUUID& cat_id)
 }
 //static
+void LLInventoryModel::findLostItems()
+{
+        sBackgroundFetchActive = TRUE;
+    sFetchQueue.push_back(LLUUID::null);
+    gIdleCallbacks.addFunction(&LLInventoryModel::backgroundFetch, NULL);
+}
+//static
 void LLInventoryModel::stopBackgroundFetch()
 {
        if (sBackgroundFetchActive)
@@ -1409,14 +1505,7 @@ void LLInventoryModel::backgroundFetch(void*)
        if (sBackgroundFetchActive)
        {
                //If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
-                std::string url;
+                std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");   
-                LLViewerRegion * agent_region = gAgent.getRegion();
-                if (agent_region)
-                {
-                        url = agent_region->getCapability("FetchInventoryDescendents");
-                }
                if (!url.empty()) 
                {
                        bulkFetch(url);
@@ -3373,12 +3462,72 @@ bool LLInventoryFetchObserver::isEverythingComplete() const
        return mIncomplete.empty();
 }
+void fetch_items_from_llsd(const LLSD& items_llsd)
+{
+        if (!items_llsd.size()) return;
+        LLSD body;
+        body[0]["cap_name"] = "FetchInventory";
+        body[1]["cap_name"] = "FetchLib";
+        for (S32 i=0; i<items_llsd.size();i++)
+        {
+                if (items_llsd[i]["owner_id"].asString() == gAgent.getID().asString())
+                {
+                        body[0]["items"].append(items_llsd[i]);
+                        continue;
+                }
+                if (items_llsd[i]["owner_id"].asString() == ALEXANDRIA_LINDEN_ID.asString())
+                {
+                        body[1]["items"].append(items_llsd[i]);
+                        continue;
+                }
+        }
+                
+        for (S32 i=0; i<body.size(); i++)
+        {
+                if (0 >= body[i].size()) continue;
+                std::string url = gAgent.getRegion()->getCapability(body[i]["cap_name"].asString());
+                if (!url.empty())
+                {
+                        body[i]["agent_id"]     = gAgent.getID();
+                        LLHTTPClient::post(url, body[i], new LLInventoryModel::fetchInventoryResponder(body[i]));
+                        break;
+                }
+                LLMessageSystem* msg = gMessageSystem;
+                BOOL start_new_message = TRUE;
+                for (S32 j=0; j<body[i]["items"].size(); j++)
+                {
+                        LLSD item_entry = body[i]["items"][j];
+                        if(start_new_message)
+                        {
+                                start_new_message = FALSE;
+                                msg->newMessageFast(_PREHASH_FetchInventory);
+                                msg->nextBlockFast(_PREHASH_AgentData);
+                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                        }
+                        msg->nextBlockFast(_PREHASH_InventoryData);
+                        msg->addUUIDFast(_PREHASH_OwnerID, item_entry["owner_id"].asUUID());
+                        msg->addUUIDFast(_PREHASH_ItemID, item_entry["item_id"].asUUID());
+                        if(msg->isSendFull(NULL))
+                        {
+                                start_new_message = TRUE;
+                                gAgent.sendReliableMessage();
+                        }
+                }
+                if(!start_new_message)
+                {
+                        gAgent.sendReliableMessage();
+                }
+        }
+}
 void LLInventoryFetchObserver::fetchItems(
        const LLInventoryFetchObserver::item_ref_t& ids)
 {
-        LLMessageSystem* msg = gMessageSystem;
-        BOOL start_new_message = TRUE;
        LLUUID owner_id;
+        LLSD items_llsd;
        for(item_ref_t::const_iterator it = ids.begin(); it < ids.end(); ++it)
        {
                LLViewerInventoryItem* item = gInventory.getItem(*it);
@@ -3400,31 +3549,18 @@ void LLInventoryFetchObserver::fetchItems(
                        // assume it's agent inventory.
                        owner_id = gAgent.getID();
                }
+                
                // It's incomplete, so put it on the incomplete container, and
                // pack this on the message.
                mIncomplete.push_back(*it);
-                if(start_new_message)
+                
-                {
+                // Prepare the data to fetch
-                        start_new_message = FALSE;
+                LLSD item_entry;
-                        msg->newMessageFast(_PREHASH_FetchInventory);
+                item_entry["owner_id"] = owner_id;
-                        msg->nextBlockFast(_PREHASH_AgentData);
+                item_entry["item_id"] = (*it);
-                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                items_llsd.append(item_entry);
-                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                }
-                msg->nextBlockFast(_PREHASH_InventoryData);
-                msg->addUUIDFast(_PREHASH_OwnerID, owner_id);
-                msg->addUUIDFast(_PREHASH_ItemID, (*it));
-                if(msg->isSendFull(NULL))
-                {
-                        start_new_message = TRUE;
-                        gAgent.sendReliableMessage();
-                }
-        }
-        if(!start_new_message)
-        {
-                gAgent.sendReliableMessage();
        }
+        fetch_items_from_llsd(items_llsd);
 }
 // virtual
@@ -3579,9 +3715,8 @@ void LLInventoryFetchComboObserver::fetch(
        // descendent of an incomplete folder because the item will show
        // up in an inventory descendents message soon enough so we do not
        // have to fetch it individually.
+        LLSD items_llsd;
        LLUUID owner_id;
-        LLMessageSystem* msg = gMessageSystem;
-        bool start_new_message = true;
        for(item_ref_t::const_iterator iit = item_ids.begin(); iit != item_ids.end(); ++iit)
        {
                LLViewerInventoryItem* item = gInventory.getItem(*iit);
@@ -3604,33 +3739,17 @@ void LLInventoryFetchComboObserver::fetch(
                }
                if(std::find(mIncompleteFolders.begin(), mIncompleteFolders.end(), item->getParentUUID()) == mIncompleteFolders.end())
                {
-                        lldebugs << "fetching item " << *iit << llendl;
+                        LLSD item_entry;
-                        if(start_new_message)
+                        item_entry["owner_id"] = owner_id;
-                        {
+                        item_entry["item_id"] = (*iit);
-                                start_new_message = false;
+                        items_llsd.append(item_entry);
-                                msg->newMessageFast(_PREHASH_FetchInventory);
-                                msg->nextBlockFast(_PREHASH_AgentData);
-                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                        }
-                        msg->nextBlockFast(_PREHASH_InventoryData);
-                        msg->addUUIDFast(_PREHASH_OwnerID, owner_id);
-                        msg->addUUIDFast(_PREHASH_ItemID, (*iit));
-                        if(msg->isSendFullFast(_PREHASH_InventoryData))
-                        {
-                                start_new_message = true;
-                                gAgent.sendReliableMessage();
-                        }
                }
                else
                {
                        lldebugs << "not worrying about " << *iit << llendl;
                }
        }
-        if(!start_new_message)
+        fetch_items_from_llsd(items_llsd);
-        {
-                gAgent.sendReliableMessage();
-        }
 }
 void LLInventoryExistenceObserver::watchItem(const LLUUID& id)
@@ -3676,7 +3795,17 @@ void LLInventoryAddedObserver::changed(U32 mask)
        // the network, figure out which item was updated.
        // Code from Gigs Taggert, sin allowed by JC.
        LLMessageSystem* msg = gMessageSystem;
-        std::string msg_name = msg->getMessageName();
+        std::string msg_name;
+        if (mMessageName.empty())
+        {
+                msg_name = msg->getMessageName();
+        }
+        else
+        {
+                msg_name = mMessageName;
+        }
        if (msg_name.empty())
        {
                return;
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index 8017410..d2be761 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -69,6 +69,7 @@ public:
        };
        virtual ~LLInventoryObserver() {};
        virtual void changed(U32 mask) = 0;
+        std::string mMessageName; // used by Agent Inventory Service only. [DEV-20328]
 };
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -110,20 +111,17 @@ public:
        LLInventoryModel();
        ~LLInventoryModel();
-        class fetchDescendentsResponder: public LLHTTPClient::Responder
+        class fetchInventoryResponder: public LLHTTPClient::Responder
        {
-                public:
+        public:
-                        fetchDescendentsResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
+                fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
-                        void result(const LLSD& content);                       
+                void result(const LLSD& content);                       
-                        void error(U32 status, const std::string& reason);
+                void error(U32 status, const std::string& reason);
-                        static void onClickRetry(S32 option, void* userdata);
-                        static void appendRetryList(LLSD retry_sd);
+        public:
-                public:
+                typedef std::vector<LLViewerInventoryCategory*> folder_ref_t;
-                        typedef std::vector<LLViewerInventoryCategory*> folder_ref_t;
+        protected:
-                protected:
+                LLSD mRequestSD;
-                        LLSD mRequestSD;
-                        static LLSD sRetrySD;
-                        static LLAlertDialog            *sRetryDialog;
        };
        //
@@ -268,7 +266,8 @@ public:
        // Call this method when it's time to update everyone on a new
        // state, by default, the inventory model will not update
        // observers automatically.
-        void notifyObservers();
+        // The optional argument 'service_name' is used by Agent Inventory Service [DEV-20328]
+        void notifyObservers(const std::string service_name="");
        // This allows outsiders to tell the inventory if something has
        // been changed 'under the hood', but outside the control of the
@@ -370,7 +369,7 @@ public:
        // start and stop background breadth-first fetching of inventory contents
        // this gets triggered when performing a filter-search
        static void startBackgroundFetch(const LLUUID& cat_id = LLUUID::null); // start fetch process
-        static void stopBackgroundFetch(); // stop fetch process
+    static void findLostItems();
        static BOOL backgroundFetchActive();
        static bool isEverythingFetched();
        static void backgroundFetch(void*); // background fetch idle function
@@ -419,7 +418,6 @@ protected:
        static void processInventoryDescendents(LLMessageSystem* msg, void**);
        static void processMoveInventoryItem(LLMessageSystem* msg, void**);
        static void processFetchInventoryReply(LLMessageSystem* msg, void**);
-        static bool isBulkFetchProcessingComplete();
        
        bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting);
@@ -460,11 +458,8 @@ protected:
        observer_list_t mObservers;
        // completing the fetch once per session should be sufficient
-        static cat_map_t sBulkFetchMap;
        static BOOL sBackgroundFetchActive;
        static BOOL sTimelyFetchPending;
-        static BOOL sAllFoldersFetched; 
-        static BOOL sFullFetchStarted;
        static S32  sNumFetchRetries;
        static LLFrameTimer sFetchTimer;
        static F32 sMinTimeBetweenFetches;
@@ -477,6 +472,11 @@ protected:
 public:
        // *NOTE: DEBUG functionality
        void dumpInventory();
+        static bool isBulkFetchProcessingComplete();
+        static void stopBackgroundFetch(); // stop fetch process
+        static BOOL sFullFetchStarted;
+        static BOOL sAllFoldersFetched; 
 };
 // a special inventory model for the agent
diff --git a/linden/indra/newview/llmaniptranslate.h b/linden/indra/newview/llmaniptranslate.h
index 7784860..383f4da 100644
--- a/linden/indra/newview/llmaniptranslate.h
+++ b/linden/indra/newview/llmaniptranslate.h
@@ -113,7 +113,7 @@ private:
        LLVector3d      mDragCursorStartGlobal;
        LLVector3d      mDragSelectionStartGlobal;
        LLTimer         mUpdateTimer;
-        typedef std::set<ManipulatorHandle*, compare_manipulators> minpulator_list_t;
+        typedef std::multiset<ManipulatorHandle*, compare_manipulators> minpulator_list_t;
        minpulator_list_t mProjectedManipulators;
        LLVector4       mManipulatorVertices[18];
        F32                     mSnapOffsetMeters;
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 22dee9d..ee853fe 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -604,9 +604,13 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                buffer = region->getHost().getString();
                msg.append(buffer);
 #endif
-                // *TODO: put this under the control of XUI so it can be
+                // *TODO: 
-                // translated.
+                //      - put this under the control of XUI so it can be translated.
-                msg.append("\n(Double-click to open Map)");
+                if ( gSavedSettings.getBOOL( "MiniMapTeleport" ))
+                        msg.append("\n(Double-click to teleport)");
+                else
+                        msg.append("\n(Double-click to open Map)");
                S32 SLOP = 4;
                localPointToScreen( 
@@ -767,7 +771,14 @@ void LLNetMap::createObjectImage()
 BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-        LLFloaterWorldMap::show(NULL, FALSE);
+        if (gSavedSettings.getBOOL( "MiniMapTeleport" ))
+        {
+                gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                gAgent.teleportViaLocation( viewPosToGlobal(x,y) );
+        }
+        else
+                LLFloaterWorldMap::show(NULL, FALSE);
        return TRUE;
 }
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 4742627..d1c34f1 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -35,6 +35,7 @@
 #include "llpanelface.h"
 
 // library includes
+#include "llcalc.h"
 #include "llerror.h"
 #include "llfocusmgr.h"
 #include "llrect.h"
@@ -60,6 +61,7 @@
 #include "llviewermedia.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
+#include "llviewerwindow.h"
 #include "lluictrlfactory.h"
 //
@@ -179,6 +181,7 @@ BOOL	LLPanelFace::postBuild()
        childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureInfo, this);
        childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureInfo, this);
        childSetAction("button align",onClickAutoFix,this);
+        childSetAction("texture_math_constants",onClickTextureConstants,this);
        clearCtrls();
@@ -381,6 +384,7 @@ void LLPanelFace::sendTextureInfo()
 void LLPanelFace::getState()
 {
        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLCalc* calcp = LLCalc::getInstance();
        if( objectp
                && objectp->getPCode() == LL_PCODE_VOLUME
@@ -754,6 +758,16 @@ void LLPanelFace::getState()
                                childSetEnabled("button apply",enabled);
                        }
                }
+                childSetEnabled("texture_math_constants",true);
+                // Set variable values for numeric expressions
+                calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal());
+                calcp->setVar(LLCalc::TEX_V_SCALE, childGetValue("TexScaleV").asReal());
+                calcp->setVar(LLCalc::TEX_U_OFFSET, childGetValue("TexOffsetU").asReal());
+                calcp->setVar(LLCalc::TEX_V_OFFSET, childGetValue("TexOffsetV").asReal());
+                calcp->setVar(LLCalc::TEX_ROTATION, childGetValue("TexRot").asReal());
+                calcp->setVar(LLCalc::TEX_TRANSPARENCY, childGetValue("ColorTrans").asReal());
+                calcp->setVar(LLCalc::TEX_GLOW, childGetValue("glow").asReal());
        }
        else
        {
@@ -787,6 +801,17 @@ void LLPanelFace::getState()
                childSetEnabled("button align",FALSE);
                childSetEnabled("button apply",FALSE);
+                childSetEnabled("texture_math_constants",false);
+                // Set variable values for numeric expressions
+                calcp->clearVar(LLCalc::TEX_U_SCALE);
+                calcp->clearVar(LLCalc::TEX_V_SCALE);
+                calcp->clearVar(LLCalc::TEX_U_OFFSET);
+                calcp->clearVar(LLCalc::TEX_V_OFFSET);
+                calcp->clearVar(LLCalc::TEX_ROTATION);
+                calcp->clearVar(LLCalc::TEX_TRANSPARENCY);
+                calcp->clearVar(LLCalc::TEX_GLOW);              
        }
 }
@@ -969,3 +994,9 @@ void LLPanelFace::onClickAutoFix(void* userdata)
        LLPanelFaceSendFunctor sendfunc;
        LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
+// static
+void LLPanelFace::onClickTextureConstants(void *)
+{
+        gViewerWindow->alertXml("ClickTextureConstants");
+}
+\ No newline at end of file
diff --git a/linden/indra/newview/llpanelface.h b/linden/indra/newview/llpanelface.h
index 230772b..b977583 100644
--- a/linden/indra/newview/llpanelface.h
+++ b/linden/indra/newview/llpanelface.h
@@ -88,6 +88,7 @@ protected:
        static void             onClickApply(void*);
        static void             onClickAutoFix(void*);
+        static void             onClickTextureConstants(void *);
        static F32      valueGlow(LLViewerObject* object, S32 face);
 };
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 256f02a..16da49d 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -109,6 +109,7 @@ LLPanelGeneral::LLPanelGeneral()
 BOOL LLPanelGeneral::postBuild()
 {
        childSetCommitCallback("fade_out_combobox", set_render_name_fade_out);
+        childSetAction("reset_ui_size", onClickResetUISize, this);
        std::string region_name_prompt = getString("region_name_prompt");
@@ -199,6 +200,7 @@ void LLPanelGeneral::refresh()
        mChatOnlineNotification = gSavedSettings.getBOOL("ChatOnlineNotification");
        mAFKTimeout = gSavedSettings.getF32("AFKTimeout");
        mMiniMapRotate = gSavedSettings.getBOOL("MiniMapRotate");
+        mMiniMapTeleport = gSavedSettings.getBOOL("MiniMapTeleport");
        mNotifyMoney = gSavedSettings.getBOOL("NotifyMoneyChange");
        mUseDefaultColor = gSavedSettings.getBOOL("UseDefaultColorPicker");
        mEffectColor = gSavedSettings.getColor4("EffectColor");
@@ -223,6 +225,7 @@ void LLPanelGeneral::cancel()
        gSavedSettings.setBOOL("ChatOnlineNotification", mChatOnlineNotification );
        gSavedSettings.setF32("AFKTimeout", mAFKTimeout );
        gSavedSettings.setBOOL("MiniMapRotate", mMiniMapRotate );
+        gSavedSettings.setBOOL("MiniMapTeleport", mMiniMapTeleport);
        gSavedSettings.setBOOL("NotifyMoneyChange", mNotifyMoney );
        gSavedSettings.setBOOL("UseDefaultColorPicker", mUseDefaultColor );
        gSavedSettings.setBOOL("ShowSearchBar", mShowSearch);
@@ -240,3 +243,10 @@ void LLPanelGeneral::clickShowStartLocation(LLUICtrl*, void* user_data)
 {
        LLPanelLogin::refreshLocation( false ); // in case LLPanelLogin is visible
 }
+// static
+void LLPanelGeneral::onClickResetUISize(void* user_data)
+{
+        gSavedSettings.setF32("UIScaleFactor", 1.0f);
+        gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
+}
+\ No newline at end of file
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index a7b526d..00dc874 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -56,6 +56,7 @@ public:
        static void clickShowStartLocation(LLUICtrl*, void* user_data);
        static void set_start_location(LLUICtrl* ctrl, void* data);
        static void set_specific_start_location(LLLineEditor* line_editor, void* data);
+        static void onClickResetUISize(void*);
 protected:
        S32 mRenderName;
@@ -71,6 +72,7 @@ protected:
        F32 mUIScaleFactor;
        BOOL mUIAutoScale;
        BOOL mMiniMapRotate;
+        BOOL mMiniMapTeleport;
        S32 mOldCrashBehavior;
        std::string mLoginLocation;
        std::string mLanguage;
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc9d969..5cd8690 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -46,6 +46,7 @@
 // project includes
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcalc.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
@@ -109,6 +110,9 @@ BOOL	LLPanelObject::postBuild()
        // Top
        //--------------------------------------------------------
        
+        // Build constant tipsheet
+        childSetAction("build_math_constants",onClickBuildConstants,this);
        // Lock checkbox
        mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked");
        childSetCommitCallback("checkbox locked",onCommitLock,this);
@@ -341,6 +345,8 @@ void LLPanelObject::getState( )
                }
        }
+        LLCalc* calcp = LLCalc::getInstance();
+        
        LLVOVolume *volobjp = NULL;
        if ( objectp && (objectp->getPCode() == LL_PCODE_VOLUME))
        {
@@ -357,6 +363,7 @@ void LLPanelObject::getState( )
                // Disable all text input fields
                clearCtrls();
+                calcp->clearAllVariables();
                return;
        }
@@ -365,6 +372,7 @@ void LLPanelObject::getState( )
        BOOL enable_scale       = objectp->permMove() && objectp->permModify();
        BOOL enable_rotate      = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
+        childSetEnabled("build_math_constants",true);
        LLVector3 vec;
        if (enable_move)
        {
@@ -372,12 +380,18 @@ void LLPanelObject::getState( )
                mCtrlPosX->set( vec.mV[VX] );
                mCtrlPosY->set( vec.mV[VY] );
                mCtrlPosZ->set( vec.mV[VZ] );
+                calcp->setVar(LLCalc::X_POS, vec.mV[VX]);
+                calcp->setVar(LLCalc::Y_POS, vec.mV[VY]);
+                calcp->setVar(LLCalc::Z_POS, vec.mV[VZ]);
        }
        else
        {
                mCtrlPosX->clear();
                mCtrlPosY->clear();
                mCtrlPosZ->clear();
+                calcp->clearVar(LLCalc::X_POS);
+                calcp->clearVar(LLCalc::Y_POS);
+                calcp->clearVar(LLCalc::Z_POS);
        }
@@ -392,12 +406,18 @@ void LLPanelObject::getState( )
                mCtrlScaleX->set( vec.mV[VX] );
                mCtrlScaleY->set( vec.mV[VY] );
                mCtrlScaleZ->set( vec.mV[VZ] );
+                calcp->setVar(LLCalc::X_SCALE, vec.mV[VX]);
+                calcp->setVar(LLCalc::Y_SCALE, vec.mV[VY]);
+                calcp->setVar(LLCalc::Z_SCALE, vec.mV[VZ]);
        }
        else
        {
                mCtrlScaleX->clear();
                mCtrlScaleY->clear();
                mCtrlScaleZ->clear();
+                calcp->setVar(LLCalc::X_SCALE, 0.f);
+                calcp->setVar(LLCalc::Y_SCALE, 0.f);
+                calcp->setVar(LLCalc::Z_SCALE, 0.f);
        }
        mLabelSize->setEnabled( enable_scale );
@@ -417,12 +437,18 @@ void LLPanelObject::getState( )
                mCtrlRotX->set( mCurEulerDegrees.mV[VX] );
                mCtrlRotY->set( mCurEulerDegrees.mV[VY] );
                mCtrlRotZ->set( mCurEulerDegrees.mV[VZ] );
+                calcp->setVar(LLCalc::X_ROT, mCurEulerDegrees.mV[VX]);
+                calcp->setVar(LLCalc::Y_ROT, mCurEulerDegrees.mV[VY]);
+                calcp->setVar(LLCalc::Z_ROT, mCurEulerDegrees.mV[VZ]);
        }
        else
        {
                mCtrlRotX->clear();
                mCtrlRotY->clear();
                mCtrlRotZ->clear();
+                calcp->clearVar(LLCalc::X_ROT);
+                calcp->clearVar(LLCalc::Y_ROT);
+                calcp->clearVar(LLCalc::Z_ROT);
        }
        mLabelRotation->setEnabled( enable_rotate );
@@ -678,8 +704,9 @@ void LLPanelObject::getState( )
                F32 end_t       = volume_params.getEndT();
                // Hollowness
-                F32 hollow = volume_params.getHollow();
+                F32 hollow = 100.f * volume_params.getHollow();
-                mSpinHollow->set( 100.f * hollow );
+                mSpinHollow->set( hollow );
+                calcp->setVar(LLCalc::HOLLOW, hollow);
                // All hollow objects allow a shape to be selected.
                if (hollow > 0.f)
@@ -732,6 +759,10 @@ void LLPanelObject::getState( )
                mSpinCutEnd             ->set( cut_end );
                mCtrlPathBegin  ->set( adv_cut_begin );
                mCtrlPathEnd    ->set( adv_cut_end );
+                calcp->setVar(LLCalc::CUT_BEGIN, cut_begin);
+                calcp->setVar(LLCalc::CUT_END, cut_end);
+                calcp->setVar(LLCalc::PATH_BEGIN, adv_cut_begin);
+                calcp->setVar(LLCalc::PATH_END, adv_cut_end);
                // Twist
                F32 twist               = volume_params.getTwist();
@@ -750,18 +781,24 @@ void LLPanelObject::getState( )
                mSpinTwist              ->set( twist );
                mSpinTwistBegin ->set( twist_begin );
+                calcp->setVar(LLCalc::TWIST_END, twist);
+                calcp->setVar(LLCalc::TWIST_BEGIN, twist_begin);
                // Shear
                F32 shear_x = volume_params.getShearX();
                F32 shear_y = volume_params.getShearY();
                mSpinShearX->set( shear_x );
                mSpinShearY->set( shear_y );
+                calcp->setVar(LLCalc::X_SHEAR, shear_x);
+                calcp->setVar(LLCalc::Y_SHEAR, shear_y);
                // Taper
                F32 taper_x     = volume_params.getTaperX();
                F32 taper_y = volume_params.getTaperY();
                mSpinTaperX->set( taper_x );
                mSpinTaperY->set( taper_y );
+                calcp->setVar(LLCalc::X_TAPER, taper_x);
+                calcp->setVar(LLCalc::Y_TAPER, taper_y);
                // Radius offset.
                F32 radius_offset = volume_params.getRadiusOffset();
@@ -791,10 +828,12 @@ void LLPanelObject::getState( )
                        }
                }
                mSpinRadiusOffset->set( radius_offset);
+                calcp->setVar(LLCalc::RADIUS_OFFSET, radius_offset);
                // Revolutions
                F32 revolutions = volume_params.getRevolutions();
                mSpinRevolutions->set( revolutions );
+                calcp->setVar(LLCalc::REVOLUTIONS, revolutions);
                
                // Skew
                F32 skew        = volume_params.getSkew();
@@ -819,6 +858,7 @@ void LLPanelObject::getState( )
                        }
                }
                mSpinSkew->set( skew );
+                calcp->setVar(LLCalc::SKEW, skew);
        }
        // Compute control visibility, label names, and twist range.
@@ -924,6 +964,8 @@ void LLPanelObject::getState( )
        case MI_RING:
                mSpinScaleX->set( scale_x );
                mSpinScaleY->set( scale_y );
+                calcp->setVar(LLCalc::X_HOLE, scale_x);
+                calcp->setVar(LLCalc::Y_HOLE, scale_y);
                mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE);
                mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X);
                mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE);
@@ -934,6 +976,8 @@ void LLPanelObject::getState( )
                {
                        mSpinScaleX->set( 1.f - scale_x );
                        mSpinScaleY->set( 1.f - scale_y );
+                        calcp->setVar(LLCalc::X_HOLE, 1.f - scale_x);
+                        calcp->setVar(LLCalc::Y_HOLE, 1.f - scale_y);
                        mSpinScaleX->setMinValue(-1.f);
                        mSpinScaleX->setMaxValue(1.f);
                        mSpinScaleY->setMinValue(-1.f);
@@ -1148,7 +1192,7 @@ void LLPanelObject::getState( )
                mSculptTextureRevert = LLUUID::null;
        }
-        
        //----------------------------------------------------------------------------
        mObject = objectp;
@@ -1913,6 +1957,8 @@ void LLPanelObject::clearCtrls()
        childSetEnabled( "advanced_cut", FALSE );
        childSetEnabled( "advanced_dimple", FALSE );
        childSetVisible("advanced_slice", FALSE);
+        childSetEnabled("build_math_constants",false);
 }
 //
@@ -1954,6 +2000,9 @@ void LLPanelObject::onCommitRotation( LLUICtrl* ctrl, void* userdata )
        LLPanelObject* self = (LLPanelObject*) userdata;
        BOOL btn_down = ((LLSpinCtrl*)ctrl)->isMouseHeldDown() ;
        self->sendRotation(btn_down);
+        // Needed to ensure all rotations are shown consistently in range
+        self->refresh();
 }
 // static
@@ -2048,3 +2097,9 @@ void LLPanelObject::onCommitSculptType(LLUICtrl *ctrl, void* userdata)
        self->sendSculpt();
 }
+// static
+void LLPanelObject::onClickBuildConstants(void *)
+{
+        gViewerWindow->alertXml("ClickBuildConstants");
+}
diff --git a/linden/indra/newview/llpanelobject.h b/linden/indra/newview/llpanelobject.h
index afdfd30..b72289c 100644
--- a/linden/indra/newview/llpanelobject.h
+++ b/linden/indra/newview/llpanelobject.h
@@ -83,6 +83,7 @@ public:
        static BOOL     onDropSculpt(          LLUICtrl* ctrl, LLInventoryItem* item, void* ud);
        static void     onCommitSculptType(    LLUICtrl *ctrl, void* userdata);
                
+        static void             onClickBuildConstants(void *);
        
 protected:
        void                    getState();
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index c863d19..84a5ecd 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2285,6 +2285,9 @@ bool idle_startup()
                        }
                }
+        //DEV-17797.  get null folder.  Any items found here moved to Lost and Found
+        LLInventoryModel::findLostItems();
                LLStartUp::setStartupState( STATE_PRECACHE );
                timeout.reset();
                return FALSE;
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 6d9d685..0323bb7 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -196,15 +196,34 @@ void LLViewerInventoryItem::fetchFromServer(void) const
 {
        if(!mIsComplete)
        {
-                LLMessageSystem* msg = gMessageSystem;
+                std::string url; 
-                msg->newMessage("FetchInventory");
-                msg->nextBlock("AgentData");
+                if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString())
-                msg->addUUID("AgentID", gAgent.getID());
+                        url = gAgent.getRegion()->getCapability("FetchLib");
-                msg->addUUID("SessionID", gAgent.getSessionID());
+                else    
-                msg->nextBlock("InventoryData");
+                        url = gAgent.getRegion()->getCapability("FetchInventory");
-                msg->addUUID("OwnerID", mPermissions.getOwner());
-                msg->addUUID("ItemID", mUUID);
+                if (!url.empty())
-                gAgent.sendReliableMessage();
+                {
+                        LLSD body;
+                        body["agent_id"]        = gAgent.getID();
+                        body["items"][0]["owner_id"]    = mPermissions.getOwner();
+                        body["items"][0]["item_id"]             = mUUID;
+                        LLHTTPClient::post(url, body, new LLInventoryModel::fetchInventoryResponder(body));
+                }
+                else
+                {
+                        LLMessageSystem* msg = gMessageSystem;
+                        msg->newMessage("FetchInventory");
+                        msg->nextBlock("AgentData");
+                        msg->addUUID("AgentID", gAgent.getID());
+                        msg->addUUID("SessionID", gAgent.getSessionID());
+                        msg->nextBlock("InventoryData");
+                        msg->addUUID("OwnerID", mPermissions.getOwner());
+                        msg->addUUID("ItemID", mUUID);
+                        gAgent.sendReliableMessage();
+                }
        }
        else
        {
@@ -441,7 +460,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
                // This comes from LLInventoryFilter from llfolderview.h
                U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
-                std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents");
+                std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");
   
                if (!url.empty()) //Capability found.  Build up LLSD and use it.
                {
@@ -449,7 +468,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
                }
                else
                {       //Deprecated, but if we don't have a capability, use the old system.
-                        llinfos << "FetchInventoryDescendents capability not found.  Using deprecated UDP message." << llendl;
+                        llinfos << "WebFetchInventoryDescendents capability not found.  Using deprecated UDP message." << llendl;
                        LLMessageSystem* msg = gMessageSystem;
                        msg->newMessage("FetchInventoryDescendents");
                        msg->nextBlock("AgentData");
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3bf390e..d607afe 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -146,13 +146,14 @@
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
 #include "llkeyboard.h"
-#include "llpanellogin.h"
+#include "lllineeditor.h"
 #include "llmenucommands.h"
 #include "llmenugl.h"
 #include "llmorphview.h"
 #include "llmoveview.h"
 #include "llmutelist.h"
 #include "llnotify.h"
+#include "llpanellogin.h"
 #include "llpanelobject.h"
 #include "llparcel.h"
 #include "llprimitive.h"
@@ -174,6 +175,7 @@
 #include "lltoolpie.h"
 #include "lltoolplacer.h"
 #include "lltoolselectland.h"
+#include "lltrans.h"
 #include "lluictrlfactory.h"
 #include "lluploaddialog.h"
 #include "lluserauth.h"
@@ -303,8 +305,6 @@ void near_sit_object();
 void label_sit_or_stand(std::string& label, void*);
 // buy and take alias into the same UI positions, so these
 // declarations handle this mess.
-BOOL is_selection_buy_not_take();
-S32 selection_price();
 BOOL enable_take();
 void handle_take();
 void confirm_take(S32 option, void* data);
@@ -786,12 +786,6 @@ void init_client_menu(LLMenuGL* menu)
        menu->appendMenu(sub_menu);
        menu->appendSeparator();
-        menu->append(new LLMenuItemCheckGL( "High-res Snapshot",
-                                                                                &menu_toggle_control,
-                                                                                NULL,
-                                                                                &menu_check_control,
-                                                                                (void*)"HighResSnapshot"));
        
        menu->append(new LLMenuItemCheckGL( "Quiet Snapshots to Disk",
                                                                                &menu_toggle_control,
@@ -799,12 +793,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                                &menu_check_control,
                                                                                (void*)"QuietSnapshotsToDisk"));
-        menu->append(new LLMenuItemCheckGL( "Compress Snapshots to Disk",
-                                                                                &menu_toggle_control,
-                                                                                NULL,
-                                                                                &menu_check_control,
-                                                                                (void*)"CompressSnapshotsToDisk"));
        menu->append(new LLMenuItemCheckGL("Show Mouselook Crosshairs",
                                                                           &menu_toggle_control,
                                                                           NULL,
@@ -923,12 +911,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                           &menu_check_control,
                                                                           (void*)"LimitSelectDistance"));
-        menu->append(new LLMenuItemCheckGL("Disable Camera Constraints", 
-                                                                           &menu_toggle_control,
-                                                                           NULL, 
-                                                                           &menu_check_control,
-                                                                           (void*)"DisableCameraConstraints"));
        menu->append(new LLMenuItemCheckGL("Mouse Smoothing",
                                                                                &menu_toggle_control,
                                                                                NULL,
@@ -1379,7 +1361,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
        menu->append(new LLMenuItemToggleGL( "Display Agent Target", &LLAgent::sDebugDisplayTarget));
        menu->append(new LLMenuItemToggleGL( "Debug Rotation", &gDebugAvatarRotation));
        menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
-        menu->append(new LLMenuItemCallGL("Rebake Textures", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
+        menu->append(new LLMenuItemCallGL("Refresh Appearance", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
 #ifndef LL_RELEASE_FOR_DOWNLOAD
        menu->append(new LLMenuItemCallGL("Debug Avatar Textures", handle_debug_avatar_textures, NULL, NULL, 'A', MASK_SHIFT|MASK_CONTROL|MASK_ALT));
        menu->append(new LLMenuItemCallGL("Dump Local Textures", handle_dump_avatar_local_textures, NULL, NULL, 'M', MASK_SHIFT|MASK_ALT ));    
@@ -1660,7 +1642,6 @@ class LLObjectEnableOpen : public view_listener_t
        }
 };
 class LLViewCheckBuildMode : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -3257,17 +3238,6 @@ class LLViewFullscreen : public view_listener_t
        }
 };
-class LLViewDefaultUISize : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gSavedSettings.setF32("UIScaleFactor", 1.0f);
-                gSavedSettings.setBOOL("UIAutoScale", FALSE);   
-                gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
-                return true;
-        }
-};
 class LLEditDuplicate : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -3928,7 +3898,7 @@ BOOL enable_take()
        return FALSE;
 }
-class LLToolsBuyOrTake : public view_listener_t
+class LLToolsTake : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
@@ -3936,115 +3906,24 @@ class LLToolsBuyOrTake : public view_listener_t
                {
                        return true;
                }
-                if (is_selection_buy_not_take())
-                {
-                        S32 total_price = selection_price();
-                        if (total_price <= gStatusBar->getBalance() || total_price == 0)
-                        {
-                                handle_buy(NULL);
-                        }
-                        else
-                        {
-                                LLFloaterBuyCurrency::buyCurrency(
-                                        "Buying this costs", total_price);
-                        }
-                }
                else
                {
                        handle_take();
+                        return true;
                }
-                return true;
        }
 };
-class LLToolsEnableBuyOrTake : public view_listener_t
+class LLToolsEnableTake : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool is_buy = is_selection_buy_not_take();
+                bool new_value = enable_take();
-                bool new_value = is_buy ? enable_buy(NULL) : enable_take();
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                // Update label
-                std::string label;
-                std::string buy_text;
-                std::string take_text;
-                std::string param = userdata["data"].asString();
-                std::string::size_type offset = param.find(",");
-                if (offset != param.npos)
-                {
-                        buy_text = param.substr(0, offset);
-                        take_text = param.substr(offset+1);
-                }
-                if (is_buy)
-                {
-                        label = buy_text;
-                }
-                else
-                {
-                        label = take_text;
-                }
-                gMenuHolder->childSetText("Pie Object Take", label);
-                gMenuHolder->childSetText("Menu Object Take", label);
                return true;
        }
 };
-// This is a small helper function to determine if we have a buy or a
-// take in the selection. This method is to help with the aliasing
-// problems of putting buy and take in the same pie menu space. After
-// a fair amont of discussion, it was determined to prefer buy over
-// take. The reasoning follows from the fact that when users walk up
-// to buy something, they will click on one or more items. Thus, if
-// anything is for sale, it becomes a buy operation, and the server
-// will group all of the buy items, and copyable/modifiable items into
-// one package and give the end user as much as the permissions will
-// allow. If the user wanted to take something, they will select fewer
-// and fewer items until only 'takeable' items are left. The one
-// exception is if you own everything in the selection that is for
-// sale, in this case, you can't buy stuff from yourself, so you can
-// take it.
-// return value = TRUE if selection is a 'buy'.
-//                FALSE if selection is a 'take'
-BOOL is_selection_buy_not_take()
-{
-        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
-        {
-                LLSelectNode* node = *iter;
-                LLViewerObject* obj = node->getObject();
-                if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
-                {
-                        // you do not own the object and it is for sale, thus,
-                        // it's a buy
-                        return TRUE;
-                }
-        }
-        return FALSE;
-}
-S32 selection_price()
-{
-        S32 total_price = 0;
-        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
-        {
-                LLSelectNode* node = *iter;
-                LLViewerObject* obj = node->getObject();
-                if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
-                {
-                        // you do not own the object and it is for sale.
-                        // Add its price.
-                        total_price += node->mSaleInfo.getSalePrice();
-                }
-        }
-        return total_price;
-}
 void callback_show_buy_currency(S32 option, void*)
 {
        if (0 == option)
@@ -4874,10 +4753,17 @@ class LLWorldCreateLandmark : public view_listener_t
                        return true;
                }
+                LLChat chat;
                LLUUID folder_id;
                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
                std::string pos_string;
                gAgent.buildLocationString(pos_string);
+                std::string log_message = LLTrans::getString("landmark_created") + " ";
+                log_message += pos_string;
+                chat.mText = log_message;
+                LLFloaterChat::addChat(chat, FALSE, FALSE);
                
                create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
                                                          folder_id, LLTransactionID::tnull,
@@ -5188,10 +5074,6 @@ class LLShowFloater : public view_listener_t
                {
                        LLFloaterPreference::show(NULL);
                }
-                else if (floater_name == "toolbar")
-                {
-                        LLToolBar::toggle(NULL);
-                }
                else if (floater_name == "chat history")
                {
                        LLFloaterChat::toggleInstance(LLSD());
@@ -5324,10 +5206,6 @@ class LLFloaterVisible : public view_listener_t
                {
                        new_value = LLFloaterMyFriends::instanceVisible(0);
                }
-                else if (floater_name == "toolbar")
-                {
-                        new_value = LLToolBar::visible(NULL);
-                }
                else if (floater_name == "chat history")
                {
                        new_value = LLFloaterChat::instanceVisible();
@@ -6259,11 +6137,6 @@ BOOL menu_ui_enabled(void *user_data)
 void menu_toggle_control( void* user_data )
 {
        BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
-        if (std::string(static_cast<char*>(user_data)) == "HighResSnapshot" && !checked)
-        {
-                // High Res Snapshot active, must uncheck RenderUIInSnapshot
-                gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
-        }
        gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked );
 }
@@ -6275,11 +6148,6 @@ class LLToggleControl : public view_listener_t
        {
                std::string control_name = userdata.asString();
                BOOL checked = gSavedSettings.getBOOL( control_name );
-                if (control_name == "HighResSnapshot" && !checked)
-                {
-                        // High Res Snapshot active, must uncheck RenderUIInSnapshot
-                        gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
-                }
                gSavedSettings.setBOOL( control_name, !checked );
                return true;
        }
@@ -7341,25 +7209,6 @@ class LLViewCheckRenderType : public view_listener_t
        }
 };
-class LLViewShowHUDAttachments : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
-                return true;
-        }
-};
-class LLViewCheckHUDAttachments : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = LLPipeline::sShowHUDAttachments;
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
 class LLEditEnableTakeOff : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9751,6 +9600,19 @@ class LLAdvancedLeaveAdminStatus : public view_listener_t
        }
 };
+class LLAvatarReportAbuse : public view_listener_t
+{
+                bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+                {
+                        LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
+                        if(avatar)
+                        {
+                                LLFloaterReporter::showFromObject(avatar->getID());
+                        }
+                        return true;
+                }
+};
 static void addMenu(view_listener_t *menu, const char *name)
@@ -9788,6 +9650,7 @@ void initialize_menus()
        addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
        addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
        addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
+        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
        // View menu
        addMenu(new LLViewMouselook(), "View.Mouselook");
@@ -9800,12 +9663,10 @@ void initialize_menus()
        addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon");
        addMenu(new LLViewBeaconWidth(), "View.BeaconWidth");
        addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
-        addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
        addMenu(new LLViewZoomOut(), "View.ZoomOut");
        addMenu(new LLViewZoomIn(), "View.ZoomIn");
        addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
        addMenu(new LLViewFullscreen(), "View.Fullscreen");
-        addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
        addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
        addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
@@ -9816,7 +9677,6 @@ void initialize_menus()
        addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
        addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
        addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
-        addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
        // World menu
        addMenu(new LLWorldChat(), "World.Chat");
@@ -9858,7 +9718,7 @@ void initialize_menus()
        addMenu(new LLToolsReleaseKeys(), "Tools.ReleaseKeys");
        addMenu(new LLToolsEnableReleaseKeys(), "Tools.EnableReleaseKeys");
        addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
-        addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
+        addMenu(new LLToolsTake(), "Tools.Take");
        addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
        addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
        addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
@@ -9868,7 +9728,7 @@ void initialize_menus()
        addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
        addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
        addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
-        addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
+        addMenu(new LLToolsEnableTake(), "Tools.EnableTake");
        addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
        addMenu(new LLToolsEnableSaveToInventory(), "Tools.SaveToInventory");
        addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.SaveToObjectInventory");
@@ -9897,6 +9757,7 @@ void initialize_menus()
        addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
        addMenu(new LLAvatarEject(), "Avatar.Eject");
        addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
+        addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
        
        addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
        addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
@@ -9942,6 +9803,7 @@ void initialize_menus()
        // Land pie menu
        addMenu(new LLLandBuild(), "Land.Build");
        addMenu(new LLLandSit(), "Land.Sit");
+        addMenu(new LLWorldCreateLandmark(),"Land.NewLandmark");
        addMenu(new LLLandBuyPass(), "Land.BuyPass");
        addMenu(new LLLandEdit(), "Land.Edit");
@@ -10096,7 +9958,6 @@ void initialize_menus()
        addMenu(new LLAdvancedToggleDebugAvatarRotation(), "Advanced.ToggleDebugAvatarRotation");
        addMenu(new LLAdvancedCheckDebugAvatarRotation(), "Advanced.CheckDebugAvatarRotation");
        addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
-        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
        addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
        addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 2944d9d..b2fd621 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1391,8 +1391,12 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
        capabilityNames.append("DispatchRegionInfo");
        capabilityNames.append("EstateChangeInfo");
        capabilityNames.append("EventQueueGet");
-        capabilityNames.append("FetchInventoryDescendents");
+        capabilityNames.append("FetchInventory");
+        capabilityNames.append("WebFetchInventoryDescendents");
+        capabilityNames.append("FetchLib");
+        capabilityNames.append("FetchLibDescendents");
        capabilityNames.append("GroupProposalBallot");
+        capabilityNames.append("HomeLocation");
        capabilityNames.append("MapLayer");
        capabilityNames.append("MapLayerGod");
        capabilityNames.append("NewFileAgentInventory");
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 2e77316..854d757 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -3812,10 +3812,6 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image)
        }
        std::string extension("." + image->getExtension());
-        if (extension.empty())
-        {
-                extension = (gSavedSettings.getBOOL("CompressSnapshotsToDisk")) ? ".j2c" : ".bmp";
-        }
        LLFilePicker::ESaveFilter pick_type;
        if (extension == ".j2c")
diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp
index d2f6748..e48b7bf 100644
--- a/linden/indra/newview/llwindebug.cpp
+++ b/linden/indra/newview/llwindebug.cpp
@@ -704,8 +704,8 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
                        ExInfo.ExceptionPointers = exception_infop;
                        ExInfo.ClientPointers = NULL;
-                        writeDumpToFile(MiniDumpNormal, &ExInfo, "SecondLife.dmp");
+                        writeDumpToFile(MiniDumpNormal, &ExInfo, "Imprudence.dmp");
-                        writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "SecondLifePlus.dmp");
+                        writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "ImprudencePlus.dmp");
                }
                info = Get_Exception_Info(exception_infop);
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c2d4301..dc9b5ea 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -385,6 +385,73 @@ Go to the Second Life web site for more information on partnering?
                        Cancel
                </option>
        </alert>
+  <alert modal="true" name="ClickBuildConstants">
+    <message name="message">
+      The following constants are accepted in this tab:
+      XP  --  X-axis position
+      YP  --  Y-axis position
+      ZP  --  Z-axis position
+      XS  --  X-axis size
+      YS  --  Y-axis size
+      ZS  --  Z-axis size
+      XR  --  X-axis rotation
+      YR  --  Y-axis rotation
+      ZR  --  Z-axis rotation
+      CB  --  Path cut begin
+      CE  --  Path cut end
+      HLW  --  Hollow size
+      SKW  --  Skew
+      PB  --  Slice/Dimple/Profile cut begin
+      PE  --  Slice/Dimple/Profile cut end
+      XSH  --  X-axis top shear
+      YSH  --  Y-axis top shear
+      XHL  --  X-axis hole size
+      YHL  --  Y-axis hole size
+      XTP  --  X-axis taper
+      YTP  --  Y-axis taper
+      ROF  --  Radius offset
+      REV  --  Revolutions
+      *  --  Multiplication
+      \  --  Division
+      +  --  Addition
+      -  --  Subtraction
+      Examples:
+      * Enter &apos;ZP + 20&apos; in the Z-axis position field
+      to move an object up 20 meters.
+      * Enter &apos;XS - YS&apos; in the X-axis size field
+      to subtract the Y size from the X size.
+    </message>
+  </alert>
+  <alert modal="true" name="ClickTextureConstants">
+    <message name="message">
+      The following constants are accepted in this tab:
+      TSU  --  Repeats per face (horizontal)
+      TSV  --  Repeats per face (vertical)
+      TOU  --  Offsets per face (horizontal)
+      TOV  --  Offsets per face (vertical)
+      TRNS --  Transparency
+      TROT --  Texture rotation
+      GLOW --  Glow
+      *  --  Multiplication
+      \  --  Division
+      +  --  Addition
+      -  --  Subtraction
+      Examples:
+      * Enter &apos;TSU * 4&apos; in horizantal repeats field
+      to increase the amount of repeats by 4x.
+      * Enter &apos;TSV&apos; in the horizontal repeats field
+      to make the horizontal and vertical
+      repeats match.
+    </message>
+  </alert>
        <alert modal="true" name="ClickWebProfileHelpAvatar">
                <message name="message">
                        If this Resident has set a web profile URL then you can:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 076598c..eb8e672 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -46,6 +46,11 @@
             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
             label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
             visible="false" width="100" />
+  <text bottom_delta="0" left="-258" height="14" width="230" name="inventory_send" halign="right" 
+        text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
+        bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
+    Drag and drop inventory here to send
+  </text>
        <panel border="false" bottom="-37" follows="left|top|right" height="20"
             left_delta="96" name="speaker_controls" width="100">
                <volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 72c92bd..3a6e4ec 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -49,7 +49,7 @@
                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
                             label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
-                             width="80" />
+                             width="92" />
                        <button bottom_delta="0" follows="left|top" halign="right" height="20"
                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                             label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 0c60090..c2eb3c2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -139,6 +139,8 @@
        <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
             increment="1" initial_val="75" label="Image Quality" left="10"
             max_val="100" min_val="0" name="image_quality_slider" width="210" />
+        <check_box bottom_delta="0" follows="left|top" label="High resolution snapshot"
+             left="10" name="high_res_check" />
        <text bottom_delta="-28" follows="left|top" height="20" left="10"
             name="layer_type_label" width="50">
                Capture:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 742da45..eb9b1c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -587,7 +587,10 @@
                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
                                Edit object parameters:
                        </text>
-                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
+      <button bottom_delta="-10" follows="left|top" font="SansSerif" halign="center"
+                             height="22" label="?" label_selected="?" right="-8" tool_tip="Object math constants" 
+                             mouse_opaque="true" name="build_math_constants" scale_image="true" width="22" />
+                        <check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Locked" left="8" mouse_opaque="true"
                             name="checkbox locked"
                             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
@@ -614,15 +617,15 @@
                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="110, 15, 15, 255" width="87" />
+                             text_enabled_color="110, 15, 15, 255" width="96" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 100, 40, 255" width="87" />
+                             text_enabled_color="0, 100, 40, 255" width="96" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 67, 132, 255" width="87" />
+                             text_enabled_color="0, 67, 132, 255" width="96" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -632,15 +635,15 @@
                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -650,15 +653,15 @@
                        <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
                             increment="1" initial_val="0" label="X" label_width="10" left="10"
                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
                             increment="1" initial_val="0" label="Y" label_width="10" left="10"
                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
                             increment="1" initial_val="0" label="Z" label_width="10" left="10"
                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -748,12 +751,12 @@
                                Skew
                        </text>
                        <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+                             increment="5" initial_val="0" left="121" max_val="95" min_val="0" 
-                             mouse_opaque="true" name="Scale 1" width="68" />
+                             mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/>
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10"
-                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
                             mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -872,10 +875,10 @@
                        </text>
                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
                             increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-                             mouse_opaque="true" name="Radius Offset" width="68" />
+                             mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
                             increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-                             mouse_opaque="true" name="Revolutions" width="68" />
+                             mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" />
                        <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
                             default_image_name="Default" follows="left|top" height="141"
                             label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1018,7 +1021,7 @@
                        </text>
                        <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
                             increment="2" initial_val="0" left="180" max_val="100" min_val="0"
-                             mouse_opaque="true" name="ColorTrans" width="80" />
+                             mouse_opaque="true" name="ColorTrans" width="58" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10"
@@ -1027,7 +1030,7 @@
                        </text>
                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
                             increment="0.1" initial_val="0" left="180" max_val="1"
-                             min_val="0" mouse_opaque="true" name="glow" width="80" />
+                             min_val="0" mouse_opaque="true" name="glow" width="58" />
                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
                             name="checkbox fullbright" width="81" />
@@ -1201,6 +1204,9 @@
                        <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
                             height="16" label="Align" label_selected="Align" left="112"
                             mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
+      <button bottom="-162" follows="left|top" font="SansSerif" halign="center"
+                             height="22" label="?" label_selected="?" right="-8" tool_tip="Texture math constants"
+                             mouse_opaque="true" name="texture_math_constants" scale_image="true" width="24" />
                </panel>
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 31288ac..aa61e77 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -223,6 +223,10 @@
             mouse_opaque="true" name="Detach From Yourself" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
+             name="Restore to Last Position" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
+        </menu_item_call>
        <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
             name="Object Wear" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index 85028d5..d16c22c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -1,20 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Attachment Pie">
-        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+        <menu_item_call enabled="true" label="Profile..." name="Profile...">
-                <on_click function="Attachment.Drop" />
+                <on_click function="ShowAgentProfile" userdata="agent" />
-                <on_enable function="Attachment.EnableDrop" />
        </menu_item_call>
-        <menu_item_separator />
+        <menu_item_call enabled="true" label="Groups..." name="Groups...">
-        <menu_item_separator />
+                <on_click function="ShowAgentGroups" userdata="agent" />
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
-                <on_click function="Attachment.Detach" />
-                <on_enable function="Attachment.EnableDetach" />
        </menu_item_call>
-        <menu_item_call enabled="false" label="Edit" mouse_opaque="true" name="Edit">
+        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
-                <on_click function="Object.Edit" />
+                        <on_click function="Object.Touch" />
-                <on_enable function="EnableEdit" />
+                        <on_enable function="Object.EnableTouch" userdata="Touch" />
+                </menu_item_call>
+        <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
+                <on_click function="Self.StandUp" userdata="" />
+                <on_enable function="Self.EnableStandUp" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Friends..." name="Friends...">
+                <on_click function="ShowFloater" userdata="friends" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
+                <on_click function="ShowFloater" userdata="gestures" />
+        </menu_item_call>
+        <pie_menu label="More &gt;" name="More &gt;">
+                <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
+                        <on_click function="Attachment.Detach" />
+                        <on_enable function="Attachment.EnableDetach" />
+                </menu_item_call>
+    <menu_item_separator />
+    <menu_item_separator />
+    <menu_item_separator />
+    <menu_item_separator />
+    <menu_item_separator />
+                <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
+                        <on_click function="Object.Edit" />
+                        <on_enable function="EnableEdit" />
+                </menu_item_call>
+    <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+      <on_click function="Attachment.Drop" />
+      <on_enable function="Attachment.EnableDrop" />
+    </menu_item_call>
+        </pie_menu>
+        <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
+                <on_click function="ShowFloater" userdata="appearance" />
+                <on_enable function="Edit.EnableCustomizeAvatar" />
        </menu_item_call>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index c8d8ed6..2d44dab 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -10,7 +10,9 @@
        <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To">
                <on_click function="GoToObject" />
        </menu_item_call>
-        <menu_item_separator />
+  <menu_item_call enabled="false" label="Abuse..." mouse_opaque="true" name="abuse">
+    <on_click function="Avatar.ReportAbuse" />
+  </menu_item_call>
        <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
                <on_click function="Avatar.AddFriend" />
                <on_enable function="Avatar.EnableAddFriend" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
index ee2a431..81ae04f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
@@ -3,7 +3,7 @@
        <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land...">
                <on_click function="ShowFloater" userdata="about land" />
        </menu_item_call>
-        <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
+        <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create">
                <on_click function="Land.Build" />
                <on_enable function="EnableEdit" />
        </menu_item_call>
@@ -13,7 +13,9 @@
        <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here">
                <on_click function="Land.Sit" />
        </menu_item_call>
-        <menu_item_separator />
+        <menu_item_call enabled="false" label="Landmark..." mouse_opaque="true" name="Add Landmark">
+                <on_click function="Land.NewLandmark" />
+        </menu_item_call>
        <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass">
                <on_click function="Land.BuyPass" />
                <on_enable function="Land.EnableBuyPass" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index c5a04ce..b63e007 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -4,9 +4,9 @@
                <on_click function="Object.Open" />
                <on_enable function="Object.EnableOpen" />
        </menu_item_call>
-        <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
+        <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
-                <on_click function="Object.Build" />
+                <on_click function="Object.Buy" />
-                <on_enable function="EnableEdit" />
+                <on_enable function="Object.EnableBuy" />
        </menu_item_call>
        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
                <on_click function="Object.Touch" />
@@ -17,56 +17,56 @@
                <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" />
        </menu_item_call>
        <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
-                <on_click function="Tools.BuyOrTake" />
+                <on_click function="Tools.Take" />
-                <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
+                <on_enable function="Tools.EnableTake" />
        </menu_item_call>
        <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
                <on_click function="PayObject" />
                <on_enable function="EnablePayObject" />
        </menu_item_call>
        <pie_menu label="More &gt;" name="More &gt;">
-                <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete">
+    <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create">
-                        <on_click function="Object.Delete" />
+      <on_click function="Object.Build" />
-                        <on_enable function="Object.EnableDelete" />
+      <on_enable function="EnableEdit" />
-                </menu_item_call>
+    </menu_item_call>
-                <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
+    <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
-                        <on_click function="Object.AttachToAvatar" />
+      <on_click function="Object.AttachToAvatar" />
-                        <on_enable function="Object.EnableWear" />
+      <on_enable function="Object.EnableWear" />
-                </menu_item_call>
+    </menu_item_call>
-                <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
+    <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
-                        <on_click function="Tools.TakeCopy" />
+      <on_click function="Tools.TakeCopy" />
-                        <on_enable function="Tools.EnableTakeCopy" />
+      <on_enable function="Tools.EnableTakeCopy" />
-                </menu_item_call>
+    </menu_item_call>
-                <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
+    <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
-                <pie_menu label="Attach &gt;" name="Object Attach" />
+    <pie_menu label="Attach &gt;" name="Object Attach" />
-                <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
+    <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
-                        <on_click function="Object.Return" />
+      <on_click function="Object.Return" />
-                        <on_enable function="Object.EnableReturn" />
+      <on_enable function="Object.EnableReturn" />
-                </menu_item_call>
+    </menu_item_call>
-                <pie_menu label="More &gt;" name="Rate Menu">
+    <pie_menu label="More &gt;" name="Rate Menu">
-                        <menu_item_separator />
+      <menu_item_separator />
-                        <menu_item_separator />
+      <menu_item_separator />
-                        <menu_item_call enabled="false" label="Report Abuse..." mouse_opaque="true"
+      <menu_item_call enabled="false" label="Abuse..." mouse_opaque="true"
                             name="Report Abuse...">
-                                <on_click function="Object.ReportAbuse" />
+        <on_click function="Object.ReportAbuse" />
-                                <on_enable function="Object.EnableReportAbuse" />
+        <on_enable function="Object.EnableReportAbuse" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <menu_item_separator />
+      <menu_item_separator />
-                        <menu_item_separator />
+      <menu_item_separator />
-                        <menu_item_separator />
+      <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
-                        <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
+        <on_click function="Object.Mute" />
-                                <on_click function="Object.Mute" />
+        <on_enable function="Object.EnableMute" />
-                                <on_enable function="Object.EnableMute" />
+      </menu_item_call>
-                        </menu_item_call>
+      <menu_item_separator />
-                        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
+      <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-                                <on_click function="Object.Inspect" />
+        <on_click function="Object.Inspect" />
-                                <on_enable function="Object.EnableInspect" />
+        <on_enable function="Object.EnableInspect" />
-                        </menu_item_call>
+      </menu_item_call>
-                </pie_menu>
+    </pie_menu>
-                <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
+    <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete">
-                        <on_click function="Object.Buy" />
+      <on_click function="Object.Delete" />
-                        <on_enable function="Object.EnableBuy" />
+      <on_enable function="Object.EnableDelete" />
-                </menu_item_call>
+    </menu_item_call>
        </pie_menu>
        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
                <on_click function="Object.Edit" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 327e22e..4fb7262 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -6,85 +6,85 @@
        <menu_item_call enabled="true" label="Groups..." name="Groups...">
                <on_click function="ShowAgentGroups" userdata="agent" />
        </menu_item_call>
-        <menu_item_call enabled="true" label="Go..." name="Go...">
+  <menu_item_call enabled="true" label="Inventory" name="Inventory">
-                <on_click function="ShowFloater" userdata="movement controls" />
+    <on_click function="ShowFloater" userdata="inventory" />
-        </menu_item_call>
+  </menu_item_call>
-        <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
+  <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
-                <on_click function="Self.StandUp" userdata="" />
+    <on_click function="Self.StandUp" userdata="" />
-                <on_enable function="Self.EnableStandUp" />
+    <on_enable function="Self.EnableStandUp" />
-        </menu_item_call>
+  </menu_item_call>
-        <menu_item_call enabled="true" label="Friends..." name="Friends...">
+  <menu_item_call enabled="true" label="Friends..." name="Friends...">
-                <on_click function="ShowFloater" userdata="friends" />
+    <on_click function="ShowFloater" userdata="friends" />
-        </menu_item_call>
+  </menu_item_call>
-        <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
+  <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
-                <on_click function="ShowFloater" userdata="gestures" />
+    <on_click function="ShowFloater" userdata="gestures" />
-        </menu_item_call>
+  </menu_item_call>
-        <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
+  <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
-                <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
+    <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
-                        <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
+      <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
                             mouse_opaque="true" name="Shirt" width="118">
-                                <on_click function="Edit.TakeOff" userdata="shirt" />
+        <on_click function="Edit.TakeOff" userdata="shirt" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="shirt" />
+        <on_enable function="Edit.EnableTakeOff" userdata="shirt" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
+      <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
                             mouse_opaque="true" name="Pants" width="118">
-                                <on_click function="Edit.TakeOff" userdata="pants" />
+        <on_click function="Edit.TakeOff" userdata="pants" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="pants" />
+        <on_enable function="Edit.EnableTakeOff" userdata="pants" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
+      <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
                             mouse_opaque="true" name="Shoes" width="118">
-                                <on_click function="Edit.TakeOff" userdata="shoes" />
+        <on_click function="Edit.TakeOff" userdata="shoes" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="shoes" />
+        <on_enable function="Edit.EnableTakeOff" userdata="shoes" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
+      <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
                             mouse_opaque="true" name="Socks" width="118">
-                                <on_click function="Edit.TakeOff" userdata="socks" />
+        <on_click function="Edit.TakeOff" userdata="socks" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="socks" />
+        <on_enable function="Edit.EnableTakeOff" userdata="socks" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
+      <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
                             mouse_opaque="true" name="Jacket" width="118">
-                                <on_click function="Edit.TakeOff" userdata="jacket" />
+        <on_click function="Edit.TakeOff" userdata="jacket" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="jacket" />
+        <on_enable function="Edit.EnableTakeOff" userdata="jacket" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
+      <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
                             mouse_opaque="true" name="Gloves" width="118">
-                                <on_click function="Edit.TakeOff" userdata="gloves" />
+        <on_click function="Edit.TakeOff" userdata="gloves" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="gloves" />
+        <on_enable function="Edit.EnableTakeOff" userdata="gloves" />
-                        </menu_item_call>
+      </menu_item_call>
-                        <pie_menu enabled="true" label="More &gt;" name="More &gt;">
+      <pie_menu enabled="true" label="More &gt;" name="More &gt;">
-                                <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
+        <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
                                     mouse_opaque="true" name="Self Undershirt" width="118">
-                                        <on_click function="Edit.TakeOff" userdata="undershirt" />
+          <on_click function="Edit.TakeOff" userdata="undershirt" />
-                                        <on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
+          <on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
-                                </menu_item_call>
+        </menu_item_call>
-                                <menu_item_separator />
+        <menu_item_separator />
-                                <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
+        <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
                                     mouse_opaque="true" name="All Clothes" width="118">
-                                        <on_click function="Edit.TakeOff" userdata="all" />
+          <on_click function="Edit.TakeOff" userdata="all" />
-                                </menu_item_call>
+        </menu_item_call>
-                                <menu_item_separator />
+        <menu_item_separator />
-                                <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
+        <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
                                     mouse_opaque="true" name="Self Underpants" width="118">
-                                        <on_click function="Edit.TakeOff" userdata="underpants" />
+          <on_click function="Edit.TakeOff" userdata="underpants" />
-                                        <on_enable function="Edit.EnableTakeOff" userdata="underpants" />
+          <on_enable function="Edit.EnableTakeOff" userdata="underpants" />
-                                </menu_item_call>
+        </menu_item_call>
-                        </pie_menu>
+      </pie_menu>
-                        <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
+      <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
                             mouse_opaque="true" name="Skirt" width="118">
-                                <on_click function="Edit.TakeOff" userdata="skirt" />
+        <on_click function="Edit.TakeOff" userdata="skirt" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
+        <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
-                        </menu_item_call>
+      </menu_item_call>
-                </pie_menu>
+    </pie_menu>
-                <menu_item_separator />
+    <menu_item_separator />
-                <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
+    <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
-                <menu_item_separator />
+    <menu_item_separator />
-                <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
+    <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
-                <menu_item_separator />
+    <menu_item_separator />
-                <menu_item_call enabled="true" label="Detach All" name="Detach All">
+    <menu_item_call enabled="true" label="Detach All" name="Detach All">
-                        <on_click function="Self.RemoveAllAttachments" userdata="" />
+      <on_click function="Self.RemoveAllAttachments" userdata="" />
-                        <on_enable function="Self.EnableRemoveAllAttachments" />
+      <on_enable function="Self.EnableRemoveAllAttachments" />
-                </menu_item_call>
+    </menu_item_call>
-        </pie_menu>
+  </pie_menu>
        <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
                <on_click function="ShowFloater" userdata="appearance" />
                <on_enable function="Edit.EnableCustomizeAvatar" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 682acb9..a741b94 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -127,8 +127,7 @@
    </menu_item_call>
    <menu_item_separator />
    <menu_item_call name="Duplicate" enabled="false"
-                    label="Duplicate"
+                    label="Duplicate">
-                    shortcut="control|D">
      <on_click function="Edit.Duplicate" userdata="" />
      <on_enable function="Edit.EnableDuplicate" />
    </menu_item_call>
@@ -205,6 +204,12 @@
                  userdata="all" />
      </menu_item_call>
    </menu>
+      <menu_item_call name="Refresh Appearance"
+                      label="Refresh Appearance"
+                      shortcut="control|alt|R">
+        <on_click function="Advanced.RebakeTextures"
+                  userdata="" />
+      </menu_item_call>
    <menu_item_separator />
    <menu_item_call name="Gestures..." label="Gestures..."
                    shortcut="control|G">
@@ -276,10 +281,6 @@
      <on_click function="ShowFloater" userdata="inworld browser" />
    </menu_item_call>
    <menu_item_separator />
-    <menu_item_check name="Toolbar" label="Toolbar">
-      <on_click function="ShowFloater" userdata="toolbar" />
-      <on_check function="FloaterVisible" userdata="toolbar" />
-    </menu_item_check>
    <menu_item_check name="Chat History" label="Local Chat"
                     shortcut="control|H">
      <on_click function="ShowFloater" userdata="chat history" />
@@ -423,7 +424,7 @@
                  userdata="hideparticles" />
      </menu_item_check>
      <menu_item_separator />
-      <menu name="Beacon Width" color="0 0 0 1" create_jump_keys="true"
+      <menu name="Beacon Width" create_jump_keys="true"
            label="Beacon Width" opaque="true" tear_off="true">
        <menu_item_call name="Beacon Width 1" label="1">
          <on_click function="View.BeaconWidth" userdata="1" />
@@ -439,34 +440,27 @@
        </menu_item_call>
      </menu>
    </menu>
-    <menu_item_check name="Show HUD Attachments"
-                     label="Show HUD Attachments"
-                     shortcut="alt|shift|H">
-      <on_click function="View.ShowHUDAttachments" userdata="" />
-      <on_check function="View.CheckHUDAttachments" />
-    </menu_item_check>
    <menu_item_separator />
-    <menu_item_call name="Zoom In" label="Zoom In"
+    <menu name="Zoom Level" create_jump_keys="true"
-                    shortcut="control|0">
+            label="Zoom Level" opaque="true" tear_off="true">
-      <on_click function="View.ZoomIn" userdata="" />
+      <menu_item_call name="Zoom In" label="Zoom In"
-    </menu_item_call>
+                      shortcut="control|0">
-    <menu_item_call name="Zoom Default" label="Zoom Default"
+        <on_click function="View.ZoomIn" userdata="" />
-                    shortcut="control|9">
+      </menu_item_call>
-      <on_click function="View.ZoomDefault" userdata="" />
+      <menu_item_call name="Zoom Default" label="Zoom Default"
-    </menu_item_call>
+                      shortcut="control|9">
-    <menu_item_call name="Zoom Out" label="Zoom Out"
+        <on_click function="View.ZoomDefault" userdata="" />
-                    shortcut="control|8">
+      </menu_item_call>
-      <on_click function="View.ZoomOut" userdata="" />
+      <menu_item_call name="Zoom Out" label="Zoom Out"
-    </menu_item_call>
+                      shortcut="control|8">
+        <on_click function="View.ZoomOut" userdata="" />
+      </menu_item_call>
+    </menu>
    <menu_item_separator />
    <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
                    shortcut="alt|Enter">
      <on_click function="View.Fullscreen" userdata="" />
    </menu_item_call>
-    <menu_item_call name="Set UI Size to Default"
-                    label="Set UI Size to Default">
-      <on_click function="View.DefaultUISize" userdata="" />
-    </menu_item_call>
  </menu>
@@ -489,7 +483,7 @@
      <on_check control="FlyBtnState" />
    </menu_item_check>
    <menu_item_separator />
-    <menu_item_call name="Create Landmark Here"
+    <menu_item_call name="Create Landmark Here" shortcut="control|D"
                    label="Create Landmark Here">
      <on_click function="World.CreateLandmark" userdata="" />
      <on_enable function="World.EnableCreateLandmark" userdata="" />
@@ -696,9 +690,9 @@
      <on_enable function="Tools.SomethingSelectedNoHUD" />
    </menu_item_call>
    <menu_item_call name="Menu Object Take" enabled="false"
-                    label="Buy Object" visible="false">
+                    label="Take" visible="false">
-      <on_click function="Tools.BuyOrTake" userdata="" />
+      <on_click function="Tools.Take" userdata="" />
-      <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
+      <on_enable function="Tools.EnableTake" />
    </menu_item_call>
    <menu_item_call name="Take Copy" enabled="false"
                    label="Take Copy">
@@ -932,24 +926,13 @@
    <menu_item_separator />
-    <menu_item_check name="High-res Snapshot"
-                     label="High-res Snapshot">
-      <on_click function="ToggleControl"
-                userdata="HighResSnapshot" />
-      <on_check control="HighResSnapshot" />
-    </menu_item_check>
    <menu_item_check name="Quiet Snapshots to Disk"
                     label="Quiet Snapshots to Disk">
      <on_click function="ToggleControl"
                userdata="QuietSnapshotsToDisk" />
      <on_check control="QuietSnapshotsToDisk" />
    </menu_item_check>
-    <menu_item_check name="Compress Snapshots to Disk"
-                     label="Compress Snapshots to Disk">
-      <on_click function="ToggleControl"
-                userdata="CompressSnapshotsToDisk" />
-      <on_check control="CompressSnapshotsToDisk" />
-    </menu_item_check>
    <menu_item_check name="Show Mouselook Crosshairs"
                     label="Show Mouselook Crosshairs">
      <on_click function="ToggleControl"
@@ -1619,7 +1602,8 @@
                  userdata="" />
      </menu_item_call>
      <menu_item_check name="Show XUI Names"
-                       label="Show XUI Names">
+                       label="Show XUI Names"
+                       shortcut="control|shift|x">
        <on_click function="Advanced.ToggleXUINames"
                  userdata="" />
        <on_check function="Advanced.CheckXUINames"
@@ -1835,12 +1819,6 @@
        <on_click function="Advanced.DumpAttachments"
                  userdata="" />
      </menu_item_call>
-      <menu_item_call name="Rebake Textures"
-                      label="Rebake Textures"
-                      shortcut="control|alt|R">
-        <on_click function="Advanced.RebakeTextures"
-                  userdata="" />
-      </menu_item_call>
    </menu>
@@ -1963,12 +1941,6 @@
                userdata="LimitSelectDistance" />
      <on_check control="LimitSelectDistance" />
    </menu_item_check>
-    <menu_item_check name="Disable Camera Constraints"
-                     label="Disable Camera Constraints">
-      <on_click function="ToggleControl"
-                userdata="DisableCameraConstraints" />
-      <on_check control="DisableCameraConstraints" />
-    </menu_item_check>
    <menu_item_check name="Mouse Smoothing"
                     label="Mouse Smoothing">
      <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 67d3307..7bd966a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -63,7 +63,11 @@
        <slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
             decimal_digits="3" enabled="true" height="16" increment="0.025"
             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="UI Scale" show_text="true" value="1" width="256" />
+             name="UI Scale" show_text="true" value="1" width="220" />
+  <button bottom="-221" enabled="true" follows="left|top"
+             font="SansSerif" halign="center" height="22" label="Reset"
+             label_selected="Reset" left_delta="226" mouse_opaque="true"
+             name="reset_ui_size" scale_image="true" width="80" />
        <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Use resolution independent scale" left="151" mouse_opaque="true"
@@ -76,6 +80,10 @@
             font="SansSerifSmall" height="16" initial_value="false"
             label="Rotate Mini-Map" left="151" mouse_opaque="true"
             name="rotate_mini_map_checkbox" radio_style="false" width="256" />
+        <check_box bottom="-286" control_name="MiniMapTeleport" enabled="true" follows="left|top"
+                   font="SansSerifSmall" height="16" initial_value="false"
+                   label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true"
+                   name="teleport_mini_map_checkbox" radio_style="false" width="256" />
        <check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Notify when Linden dollars (L$) spent or received" left="151"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 23e357f..1867323 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -79,18 +79,23 @@
             label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
             name="appearance camera movement" radio_style="false"
             tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+        <check_box bottom_delta="-18" control_name="DisableCameraConstraints" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Disable camera constraints" left="148" mouse_opaque="true"
+             name="Disable camera constraints" radio_style="false"
+             tool_tip="Disables camera limits such as distance and terrain" width="242" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-228" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="text2" v_pad="0" width="128">
                Avatar Display Options:
        </text>
-        <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom_delta="-4" control_name="FirstPersonAvatarVisible" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
             radio_style="false" width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="text5" v_pad="0" width="128">
                Joystick Options:
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index e8c341e..ecacc78 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1,180 +1,183 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- This file contains strings that used to be hardcoded in the source.
+<!-- This file contains strings that used to be hardcoded in the source.
-     It is only for those strings which don't belong in a floater.
+     It is only for those strings which don't belong in a floater.
-     For example, the strings used in avatar chat bubbles, and strings 
+     For example, the strings used in avatar chat bubbles, and strings 
-     that are returned from one component and may appear in many places-->
+     that are returned from one component and may appear in many places-->
-<strings>
+<strings>
-        
+        
-        <!-- Login -->
+        <!-- Login -->
-        <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
+        <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
-        <string name="LoginAuthenticating">Authenticating</string>
+        <string name="LoginAuthenticating">Authenticating</string>
-        <string name="LoginMaintenance">Performing account maintenance...</string>
+        <string name="LoginMaintenance">Performing account maintenance...</string>
-        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
+        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
-        <string name="LoginPrecaching">Loading world...</string>
+        <string name="LoginPrecaching">Loading world...</string>
-        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
+        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
-        <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
+        <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
-        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
+        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
-        <string name="LoginProcessingResponse">Processing Response...</string>
+        <string name="LoginProcessingResponse">Processing Response...</string>
-        <string name="LoginInitializingWorld">Initializing World...</string>
+        <string name="LoginInitializingWorld">Initializing World...</string>
-        <string name="LoginDecodingImages">Decoding images...</string>
+        <string name="LoginDecodingImages">Decoding images...</string>
-        <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
+        <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
-        <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
+        <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
-        <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>
+        <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>
-        <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
+        <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
-        <string name="LoginConnectingToRegion">Connecting to region...</string>
+        <string name="LoginConnectingToRegion">Connecting to region...</string>
-        <string name="LoginDownloadingClothing">Downloading clothing...</string>
+        <string name="LoginDownloadingClothing">Downloading clothing...</string>
-  <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+  <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
-        <!-- Disconnection -->
+        <!-- Disconnection -->
-        <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
+        <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
-        
+        
-        
+        
-        <!-- Tooltip, llhoverview.cpp -->
+        <!-- Tooltip, llhoverview.cpp -->
-        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
+        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
-        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
+        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
-        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
+        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
-        <string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->
+        <string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->
-        <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->
+        <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->
-        <string name="TooltipFlagScript">Script</string>
+        <string name="TooltipFlagScript">Script</string>
-        <string name="TooltipFlagPhysics">Physics</string>
+        <string name="TooltipFlagPhysics">Physics</string>
-        <string name="TooltipFlagTouch">Touch</string>
+        <string name="TooltipFlagTouch">Touch</string>
-        <string name="TooltipFlagL$">L$</string>
+        <string name="TooltipFlagL$">L$</string>
-        <string name="TooltipFlagDropInventory">Drop Inventory</string>
+        <string name="TooltipFlagDropInventory">Drop Inventory</string>
-        <string name="TooltipFlagPhantom">Phantom</string>
+        <string name="TooltipFlagPhantom">Phantom</string>
-        <string name="TooltipFlagTemporary">Temporary</string>
+        <string name="TooltipFlagTemporary">Temporary</string>
-        <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>
+        <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>
-        <string name="TooltipFreeToCopy">Free to copy</string>
+        <string name="TooltipFreeToCopy">Free to copy</string>
-        <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->
+        <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->
-        <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->
+        <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->
-        <string name="TooltipFlagGroupBuild">Group Build</string>
+        <string name="TooltipFlagGroupBuild">Group Build</string>
-        <string name="TooltipFlagNoBuild">No Build</string>
+        <string name="TooltipFlagNoBuild">No Build</string>
-        <string name="TooltipFlagNoEdit">Group Build</string>
+        <string name="TooltipFlagNoEdit">Group Build</string>
-        <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->
+        <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->
-        <string name="TooltipFlagNoFly">No Fly</string>
+        <string name="TooltipFlagNoFly">No Fly</string>
-        <string name="TooltipFlagGroupScripts">Group Scripts</string>
+        <string name="TooltipFlagGroupScripts">Group Scripts</string>
-        <string name="TooltipFlagNoScripts">No Scripts</string>
+        <string name="TooltipFlagNoScripts">No Scripts</string>
-        <string name="TooltipLand">Land:</string>
+        <string name="TooltipLand">Land:</string>
-        <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    
+        <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    
-        
+        
-        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
-        <string name="RetrievingData">Retrieving...</string>
+        <string name="RetrievingData">Retrieving...</string>
-        <string name="ReleaseNotes">Release Notes</string>
+        <string name="ReleaseNotes">Release Notes</string>
-        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
-        <string name="LoadingData">Loading...</string>
+        <string name="LoadingData">Loading...</string>
-        
+        
-        
+        
-        <!-- namecache -->
+        <!-- namecache -->
-        <!-- Avatar name: text shown for LLUUID::null -->
+        <!-- Avatar name: text shown for LLUUID::null -->
-        <string name="AvatarNameNobody">(nobody)</string>
+        <string name="AvatarNameNobody">(nobody)</string>
-        
+        
-        <!-- Avatar name: text shown while fetching name -->
+        <!-- Avatar name: text shown while fetching name -->
-        <string name="AvatarNameWaiting">(waiting)</string>
+        <string name="AvatarNameWaiting">(waiting)</string>
-        <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+        <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
-        <string name="AvatarNameHippos">(hippos)</string>
+        <string name="AvatarNameHippos">(hippos)</string>
-        
+        
-        <!-- Group name: text shown for LLUUID::null -->
+        <!-- Group name: text shown for LLUUID::null -->
-        <string name="GroupNameNone">(none)</string>
+        <string name="GroupNameNone">(none)</string>
-        
+        
-        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
-        <string name="AssetErrorNone">No error</string>
+        <string name="AssetErrorNone">No error</string>
-        <string name="AssetErrorRequestFailed">Asset request: failed</string>
+        <string name="AssetErrorRequestFailed">Asset request: failed</string>
-        <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>
+        <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>
-        <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>
+        <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>
-        <string name="AssetErrorEOF">End of file</string>
+        <string name="AssetErrorEOF">End of file</string>
-        <string name="AssetErrorCannotOpenFile">Cannot open file</string>
+        <string name="AssetErrorCannotOpenFile">Cannot open file</string>
-        <string name="AssetErrorFileNotFound">File not found</string>
+        <string name="AssetErrorFileNotFound">File not found</string>
-        <string name="AssetErrorTCPTimeout">File transfer timeout</string>
+        <string name="AssetErrorTCPTimeout">File transfer timeout</string>
-        <string name="AssetErrorCircuitGone">Circuit gone</string>
+        <string name="AssetErrorCircuitGone">Circuit gone</string>
-        <string name="AssetErrorUnknownStatus">Unknown status</string>
+        <string name="AssetErrorUnknownStatus">Unknown status</string>
-        
+        
-        <!-- llvoavatar. Displayed in the avatar's chat bubble -->
+        <!-- llvoavatar. Displayed in the avatar's chat bubble -->
-        <string name="AvatarEditingApparance">(Editing Appearance)</string>
+        <string name="AvatarEditingApparance">(Editing Appearance)</string>
-        <string name="AvatarAway">Away</string>
+        <string name="AvatarAway">Away</string>
-        <string name="AvatarBusy">Busy</string>
+        <string name="AvatarBusy">Busy</string>
-        <string name="AvatarMuted">Muted</string>
+        <string name="AvatarMuted">Muted</string>
-        <!-- animations -->
+        <!-- animations -->
-        <string name="anim_express_afraid">Afraid</string>
+        <string name="anim_express_afraid">Afraid</string>
-        <string name="anim_express_anger">Angry</string>
+        <string name="anim_express_anger">Angry</string>
-        <string name="anim_away">Away</string>
+        <string name="anim_away">Away</string>
-        <string name="anim_backflip">Backflip</string>
+        <string name="anim_backflip">Backflip</string>
-        <string name="anim_express_laugh">Belly Laugh</string>
+        <string name="anim_express_laugh">Belly Laugh</string>
-        <string name="anim_express_toothsmile">BigSmile</string>
+        <string name="anim_express_toothsmile">BigSmile</string>
-        <string name="anim_blowkiss">Blow Kiss</string>
+        <string name="anim_blowkiss">Blow Kiss</string>
-        <string name="anim_express_bored">Bored</string>
+        <string name="anim_express_bored">Bored</string>
-        <string name="anim_bow">Bow</string>
+        <string name="anim_bow">Bow</string>
-        <string name="anim_clap">Clap</string>
+        <string name="anim_clap">Clap</string>
-        <string name="anim_courtbow">Court Bow</string>
+        <string name="anim_courtbow">Court Bow</string>
-        <string name="anim_express_cry">Cry</string>
+        <string name="anim_express_cry">Cry</string>
-        <string name="anim_dance1">Dance 1</string>
+        <string name="anim_dance1">Dance 1</string>
-        <string name="anim_dance2">Dance 2</string>
+        <string name="anim_dance2">Dance 2</string>
-        <string name="anim_dance3">Dance 3</string>
+        <string name="anim_dance3">Dance 3</string>
-        <string name="anim_dance4">Dance 4</string>
+        <string name="anim_dance4">Dance 4</string>
-        <string name="anim_dance5">Dance 5</string>
+        <string name="anim_dance5">Dance 5</string>
-        <string name="anim_dance6">Dance 6</string>
+        <string name="anim_dance6">Dance 6</string>
-        <string name="anim_dance7">Dance 7</string>
+        <string name="anim_dance7">Dance 7</string>
-        <string name="anim_dance8">Dance 8</string>
+        <string name="anim_dance8">Dance 8</string>
-        <string name="anim_express_disdain">Disdain</string>
+        <string name="anim_express_disdain">Disdain</string>
-        <string name="anim_drink">Drink</string>
+        <string name="anim_drink">Drink</string>
-        <string name="anim_express_embarrased">Embarrassed</string>
+        <string name="anim_express_embarrased">Embarrassed</string>
-        <string name="anim_angry_fingerwag">Finger Wag</string>
+        <string name="anim_angry_fingerwag">Finger Wag</string>
-        <string name="anim_fist_pump">Fist Pump</string>
+        <string name="anim_fist_pump">Fist Pump</string>
-        <string name="anim_yoga_float">Floating Yoga</string>
+        <string name="anim_yoga_float">Floating Yoga</string>
-        <string name="anim_express_frown">Frown</string>
+        <string name="anim_express_frown">Frown</string>
-        <string name="anim_impatient">Impatient</string>
+        <string name="anim_impatient">Impatient</string>
-        <string name="anim_jumpforjoy">Jump For Joy</string>
+        <string name="anim_jumpforjoy">Jump For Joy</string>
-        <string name="anim_kissmybutt">Kiss My Butt</string>
+        <string name="anim_kissmybutt">Kiss My Butt</string>
-        <string name="anim_express_kiss">Kiss</string>
+        <string name="anim_express_kiss">Kiss</string>
-        <string name="anim_laugh_short">Laugh</string>
+        <string name="anim_laugh_short">Laugh</string>
-        <string name="anim_musclebeach">Muscle Beach</string>
+        <string name="anim_musclebeach">Muscle Beach</string>
-        <string name="anim_no_unhappy">No (Unhappy)</string>
+        <string name="anim_no_unhappy">No (Unhappy)</string>
-        <string name="anim_no_head">No</string>
+        <string name="anim_no_head">No</string>
-        <string name="anim_nyanya">Nya-nya-nya</string>
+        <string name="anim_nyanya">Nya-nya-nya</string>
-        <string name="anim_punch_onetwo">One-Two Punch</string>
+        <string name="anim_punch_onetwo">One-Two Punch</string>
-        <string name="anim_express_open_mouth">Open Mouth</string>
+        <string name="anim_express_open_mouth">Open Mouth</string>
-        <string name="anim_peace">Peace</string>
+        <string name="anim_peace">Peace</string>
-        <string name="anim_point_you">Point at Other</string>
+        <string name="anim_point_you">Point at Other</string>
-        <string name="anim_point_me">Point at Self</string>
+        <string name="anim_point_me">Point at Self</string>
-        <string name="anim_punch_l">Punch Left</string>
+        <string name="anim_punch_l">Punch Left</string>
-        <string name="anim_punch_r">Punch Right</string>
+        <string name="anim_punch_r">Punch Right</string>
-        <string name="anim_rps_countdown">RPS count</string>
+        <string name="anim_rps_countdown">RPS count</string>
-        <string name="anim_rps_paper">RPS paper</string>
+        <string name="anim_rps_paper">RPS paper</string>
-        <string name="anim_rps_rock">RPS rock</string>
+        <string name="anim_rps_rock">RPS rock</string>
-        <string name="anim_rps_scissors">RPS scissors</string>
+        <string name="anim_rps_scissors">RPS scissors</string>
-        <string name="anim_express_repulsed">Repulsed</string>
+        <string name="anim_express_repulsed">Repulsed</string>
-        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
+        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
-        <string name="anim_express_sad">Sad</string>
+        <string name="anim_express_sad">Sad</string>
-        <string name="anim_salute">Salute</string>
+        <string name="anim_salute">Salute</string>
-        <string name="anim_shout">Shout</string>
+        <string name="anim_shout">Shout</string>
-        <string name="anim_express_shrug">Shrug</string>
+        <string name="anim_express_shrug">Shrug</string>
-        <string name="anim_express_smile">Smile</string>
+        <string name="anim_express_smile">Smile</string>
-        <string name="anim_smoke_idle">Smoke Idle</string>
+        <string name="anim_smoke_idle">Smoke Idle</string>
-        <string name="anim_smoke_inhale">Smoke Inhale</string>
+        <string name="anim_smoke_inhale">Smoke Inhale</string>
-        <string name="anim_smoke_throw_down">Smoke Throw Down</string>
+        <string name="anim_smoke_throw_down">Smoke Throw Down</string>
-        <string name="anim_express_surprise">Surprise</string>
+        <string name="anim_express_surprise">Surprise</string>
-        <string name="anim_sword_strike_r">Sword Strike</string>
+        <string name="anim_sword_strike_r">Sword Strike</string>
-        <string name="anim_angry_tantrum">Tantrum</string>
+        <string name="anim_angry_tantrum">Tantrum</string>
-        <string name="anim_express_tongue_out">TongueOut</string>
+        <string name="anim_express_tongue_out">TongueOut</string>
-        <string name="anim_hello">Wave</string>
+        <string name="anim_hello">Wave</string>
-        <string name="anim_whisper">Whisper</string>
+        <string name="anim_whisper">Whisper</string>
-        <string name="anim_whistle">Whistle</string>
+        <string name="anim_whistle">Whistle</string>
-        <string name="anim_express_wink">Wink</string>
+        <string name="anim_express_wink">Wink</string>
-        <string name="anim_wink_hollywood">Wink (Hollywood)</string>
+        <string name="anim_wink_hollywood">Wink (Hollywood)</string>
-        <string name="anim_express_worry">Worry</string>
+        <string name="anim_express_worry">Worry</string>
-        <string name="anim_yes_happy">Yes (Happy)</string>
+        <string name="anim_yes_happy">Yes (Happy)</string>
-        <string name="anim_yes_head">Yes</string>
+        <string name="anim_yes_head">Yes</string>
-        
+        
-        <string name="texture_loading">Loading...</string>
+        <string name="texture_loading">Loading...</string>
-        <string name="worldmap_offline">Offline</string>
+        <string name="worldmap_offline">Offline</string>
-        
+        
-        <!-- Chat -->
+        <!-- Chat -->
-        <string name="whisper">whispers:</string>
+        <string name="whisper">whispers:</string>
-        <string name="shout">shouts:</string>
+        <string name="shout">shouts:</string>
-</strings>
+  <!-- System messages -->
+  <string name="landmark_created">You created a landmark at</string>
+</strings>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 50ce466..9742d2f 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -1,508 +1,508 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floaterland" title="À propos du terrain">
+<floater name="floaterland" title="À propos du terrain">
-        <tab_container name="landtab">
+        <tab_container name="landtab">
-                <panel label="Général" name="land_general_panel">
+                <panel label="Général" name="land_general_panel">
-                        <text type="string" length="1" name="Name:">
+                        <text type="string" length="1" name="Name:">
-                                Nom :
+                                Nom :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Description:">
+                        <text type="string" length="1" name="Description:">
-                                Description :
+                                Description :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Owner:">
+                        <text type="string" length="1" name="Owner:">
-                                Propriétaire :
+                                Propriétaire :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="OwnerText">
+                        <text type="string" length="1" name="OwnerText">
-                                Leyla Linden
+                                Leyla Linden
-                        </text>
+                        </text>
-                        <button label="Profil..." label_selected="Profil..." name="Profile..." />
+                        <button label="Profil..." label_selected="Profil..." name="Profile..." />
-                        <text type="string" length="1" name="Group:">
+                        <text type="string" length="1" name="Group:">
-                                Groupe :
+                                Groupe :
-                        </text>
+                        </text>
-                        <button label="Définir..." label_selected="Définir..." name="Set..." />
+                        <button label="Définir..." label_selected="Définir..." name="Set..." />
-                        <check_box label="Autoriser le transfert au groupe" name="check deed"
+                        <check_box label="Autoriser le transfert au groupe" name="check deed"
-                             tool_tip="Un officier peut transférer ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe." />
+                             tool_tip="Un officier peut transférer ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe." />
-                        <button label="Transférer..." label_selected="Transférer..." name="Deed..."
+                        <button label="Transférer..." label_selected="Transférer..." name="Deed..."
-                             tool_tip="Vous ne pouvez transférer le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné." />
+                             tool_tip="Vous ne pouvez transférer le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné." />
-                        <check_box label="Le propriétaire contribue par transfert" name="check contib"
+                        <check_box label="Le propriétaire contribue par transfert" name="check contib"
-                             tool_tip="Lorsque le terrain est transféré au groupe, la contribution du précédent propriétaire suffit à l&apos;entretenir." />
+                             tool_tip="Lorsque le terrain est transféré au groupe, la contribution du précédent propriétaire suffit à l&apos;entretenir." />
-                        <check_box label="Le propriétaire contribue par une donation" name="check contrib"
+                        <check_box label="Le propriétaire contribue par une donation" name="check contrib"
-                             tool_tip="Lorsqu&apos;un titre de propriété est transféré au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant." />
+                             tool_tip="Lorsqu&apos;un titre de propriété est transféré au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant." />
-                        <text type="string" length="1" name="For Sale:">
+                        <text type="string" length="1" name="For Sale:">
-                                À vendre :
+                                À vendre :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Not for sale.">
+                        <text type="string" length="1" name="Not for sale.">
-                                Pas à vendre.
+                                Pas à vendre.
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="For Sale: Price L$[PRICE].">
+                        <text type="string" length="1" name="For Sale: Price L$[PRICE].">
-                                Prix : [PRICE] $L.
+                                Prix : [PRICE] $L.
-                        </text>
+                        </text>
-                        <button label="Vendre le terrain..." label_selected="Vendre le terrain..."
+                        <button label="Vendre le terrain..." label_selected="Vendre le terrain..."
-                             name="Sell Land..." />
+                             name="Sell Land..." />
-                        <text type="string" length="1" name="For sale to">
+                        <text type="string" length="1" name="For sale to">
-                                À vendre à : [BUYER]
+                                À vendre à : [BUYER]
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Sell with landowners objects in parcel.">
+                        <text type="string" length="1" name="Sell with landowners objects in parcel.">
-                                Objets inclus dans la vente.
+                                Objets inclus dans la vente.
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Selling with no objects in parcel.">
+                        <text type="string" length="1" name="Selling with no objects in parcel.">
-                                Objets non inclus dans la vente.
+                                Objets non inclus dans la vente.
-                        </text>
+                        </text>
-                        <button label="Annuler la vente du terrain"
+                        <button label="Annuler la vente du terrain"
-                             label_selected="Annuler la vente du terrain" name="Cancel Land Sale" />
+                             label_selected="Annuler la vente du terrain" name="Cancel Land Sale" />
-                        <text type="string" length="1" name="Claimed:">
+                        <text type="string" length="1" name="Claimed:">
-                                Réclamée :
+                                Réclamée :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="DateClaimText">
+                        <text type="string" length="1" name="DateClaimText">
-                                Tue Aug 15 13:47:25 2006
+                                Tue Aug 15 13:47:25 2006
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="PriceLabel">
+                        <text type="string" length="1" name="PriceLabel">
-                                Surface :
+                                Surface :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="PriceText">
+                        <text type="string" length="1" name="PriceText">
-                                4048 m²
+                                4048 m²
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Traffic:">
+                        <text type="string" length="1" name="Traffic:">
-                                Trafic :
+                                Trafic :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="DwellText">
+                        <text type="string" length="1" name="DwellText">
-                                0
+                                0
-                        </text>
+                        </text>
-                        <button label="Acheter le terrain..." label_selected="Acheter le terrain..."
+                        <button label="Acheter le terrain..." label_selected="Acheter le terrain..."
-                             name="Buy Land..." />
+                             name="Buy Land..." />
-                        <button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..."
+                        <button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..."
-                             name="Buy For Group..." />
+                             name="Buy For Group..." />
-                        <button label="Acheter un passe..." label_selected="Acheter un passe..."
+                        <button label="Acheter un passe..." label_selected="Acheter un passe..."
-                             name="Buy Pass..."
+                             name="Buy Pass..."
-                             tool_tip="Un passe vous donne un accès temporaire à ce terrain." />
+                             tool_tip="Un passe vous donne un accès temporaire à ce terrain." />
-                        <button label="Céder le terrain..." label_selected="Céder le terrain..."
+                        <button label="Céder le terrain..." label_selected="Céder le terrain..."
-                             name="Abandon Land..." />
+                             name="Abandon Land..." />
-                        <button label="Récupérer le terrain…" label_selected="Récupérer le terrain…"
+                        <button label="Récupérer le terrain…" label_selected="Récupérer le terrain…"
-                             name="Reclaim Land..." />
+                             name="Reclaim Land..." />
-                        <button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..."
+                        <button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..."
-                             tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères." />
+                             tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères." />
-                        <text name="new users only">
+                        <text name="new users only">
-                                Nouveaux utilisateurs uniquement
+                                Nouveaux utilisateurs uniquement
-                        </text>
+                        </text>
-                        <text name="anyone">
+                        <text name="anyone">
-                                Tout le monde
+                                Tout le monde
-                        </text>
+                        </text>
-                        <string name="area_text">
+                        <string name="area_text">
-                                Surface
+                                Surface
-                        </string>
+                        </string>
-                        <string name="area_size_text">
+                        <string name="area_size_text">
-                                [AREA] m²
+                                [AREA] m²
-                        </string>
+                        </string>
-                        <string name="auction_id_text">
+                        <string name="auction_id_text">
-                                Code de l&apos;enchère : [ID]
+                                Code de l&apos;enchère : [ID]
-                        </string>
+                        </string>
-                        <string name="need_tier_to_modify">
+                        <string name="need_tier_to_modify">
-                                Pour modifier ce terrain, vous devez approuver votre achat.
+                                Pour modifier ce terrain, vous devez approuver votre achat.
-                        </string>
+                        </string>
-                        <string name="group_owned_text">
+                        <string name="group_owned_text">
-                                (propriété du groupe)
+                                (propriété du groupe)
-                        </string>
+                        </string>
-                        <string name="profile_text">
+                        <string name="profile_text">
-                                Profil...
+                                Profil...
-                        </string>
+                        </string>
-                        <string name="info_text">
+                        <string name="info_text">
-                                Infos...
+                                Infos...
-                        </string>
+                        </string>
-                        <string name="public_text">
+                        <string name="public_text">
-                                (public)
+                                (public)
-                        </string>
+                        </string>
-                        <string name="none_text">
+                        <string name="none_text">
-                                (aucun)
+                                (aucun)
-                        </string>
+                        </string>
-                        <string name="sale_pending_text">
+                        <string name="sale_pending_text">
-                                (vente en cours)
+                                (vente en cours)
-                        </string>
+                        </string>
-                        <string name="no_selection_text">
+                        <string name="no_selection_text">
-                                Aucune parcelle sélectionnée.
+                                Aucune parcelle sélectionnée.
-Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails.
+Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails.
-                        </string>
+                        </string>
-                </panel>
+                </panel>
-                <panel label="Règlement" name="land_covenant_panel">
+                <panel label="Règlement" name="land_covenant_panel">
-                        <text type="string" length="1" name="covenant_timestamp_text">
+                        <text type="string" length="1" name="covenant_timestamp_text">
-                                Last Modified Wed Dec 31 16:00:00 1969
+                                Last Modified Wed Dec 31 16:00:00 1969
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="region_name_lbl">
+                        <text type="string" length="1" name="region_name_lbl">
-                                Région :
+                                Région :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="region_name_text">
+                        <text type="string" length="1" name="region_name_text">
-                                leyla
+                                leyla
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="estate_name_lbl">
+                        <text type="string" length="1" name="estate_name_lbl">
-                                Domaine :
+                                Domaine :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="estate_name_text">
+                        <text type="string" length="1" name="estate_name_text">
-                                continent
+                                continent
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="estate_owner_lbl">
+                        <text type="string" length="1" name="estate_owner_lbl">
-                                Propriétaire :
+                                Propriétaire :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="estate_owner_text">
+                        <text type="string" length="1" name="estate_owner_text">
-                                (aucun)
+                                (aucun)
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="resellable_clause">
+                        <text type="string" length="1" name="resellable_clause">
-                                Le terrain acheté dans cette région ne peut être revendu.
+                                Le terrain acheté dans cette région ne peut être revendu.
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="changeable_clause">
+                        <text type="string" length="1" name="changeable_clause">
-                                Le terrain acheté dans cette région ne peut être revendu/divisé.
+                                Le terrain acheté dans cette région ne peut être revendu/divisé.
-                        </text>
+                        </text>
-                        <text_editor type="string" length="1" name="covenant_editor">
+                        <text_editor type="string" length="1" name="covenant_editor">
-                                Il n&apos;y a aucun règlement pour ce domaine.
+                                Il n&apos;y a aucun règlement pour ce domaine.
-                        </text_editor>
+                        </text_editor>
-                        <text name="can_resell">
+                        <text name="can_resell">
-                                Le terrain acheté dans cette région peut être revendu.
+                                Le terrain acheté dans cette région peut être revendu.
-                        </text>
+                        </text>
-                        <text name="can_not_resell">
+                        <text name="can_not_resell">
-                                Le terrain acheté dans cette région ne peut pas être revendu.
+                                Le terrain acheté dans cette région ne peut pas être revendu.
-                        </text>
+                        </text>
-                        <text name="can_change">
+                        <text name="can_change">
-                                Le terrain acheté dans cette région peut être fusionné ou divisé.
+                                Le terrain acheté dans cette région peut être fusionné ou divisé.
-                        </text>
+                        </text>
-                        <text name="can_not_change">
+                        <text name="can_not_change">
-                                Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+                                Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
-                        </text>
+                        </text>
-                </panel>
+                </panel>
-                <panel label="Objets" name="land_objects_panel">
+                <panel label="Objets" name="land_objects_panel">
-                        <text name="parcel_object_bonus">
+                        <text name="parcel_object_bonus">
-                                Facteur Bonus Objets : [BONUS]
+                                Facteur Bonus Objets : [BONUS]
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Simulator primitive usage:">
+                        <text type="string" length="1" name="Simulator primitive usage:">
-                                Prims utilisés sur le sim :
+                                Prims utilisés sur le sim :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="0 out of 0 available">
+                        <text type="string" length="1" name="0 out of 0 available">
-                                0 sur 14055 (14055 disponibles)
+                                0 sur 14055 (14055 disponibles)
-                        </text>
+                        </text>
-                        <text name="objects_available">
+                        <text name="objects_available">
-                                [COUNT] sur [COUNT] ([COUNT] disponibles)
+                                [COUNT] sur [COUNT] ([COUNT] disponibles)
-                        </text>
+                        </text>
-                        <string name="objects_available_text">
+                        <string name="objects_available_text">
-                                [COUNT] sur [MAX] ([AVAILABLE] disponibles)
+                                [COUNT] sur [MAX] ([AVAILABLE] disponibles)
-                        </string>
+                        </string>
-                        <string name="objects_deleted_text">
+                        <string name="objects_deleted_text">
-                                [COUNT] sur [MAX] ([DELETED] seront supprimés)
+                                [COUNT] sur [MAX] ([DELETED] seront supprimés)
-                        </string>
+                        </string>
-                        <text type="string" length="1" name="Primitives parcel supports:">
+                        <text type="string" length="1" name="Primitives parcel supports:">
-                                Prims max. sur la parcelle :
+                                Prims max. sur la parcelle :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="object_contrib_text">
+                        <text type="string" length="1" name="object_contrib_text">
-                                [COUNT]
+                                [COUNT]
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Primitives on parcel:">
+                        <text type="string" length="1" name="Primitives on parcel:">
-                                Prims sur la parcelle :
+                                Prims sur la parcelle :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="total_objects_text">
+                        <text type="string" length="1" name="total_objects_text">
-                                [COUNT]
+                                [COUNT]
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Owned by parcel owner:">
+                        <text type="string" length="1" name="Owned by parcel owner:">
-                                Appartenant au propriétaire :
+                                Appartenant au propriétaire :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="owner_objects_text">
+                        <text type="string" length="1" name="owner_objects_text">
-                                [COUNT]
+                                [COUNT]
-                        </text>
+                        </text>
-                        <button label="Afficher" label_selected="Afficher" name="ShowOwner" />
+                        <button label="Afficher" label_selected="Afficher" name="ShowOwner" />
-                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..."
+                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..."
-                             tool_tip="Renvoyer les objets à leurs propriétaires." />
+                             tool_tip="Renvoyer les objets à leurs propriétaires." />
-                        <text type="string" length="1" name="Set to group:">
+                        <text type="string" length="1" name="Set to group:">
-                                Donnés au groupe :
+                                Donnés au groupe :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="group_objects_text">
+                        <text type="string" length="1" name="group_objects_text">
-                                0
+                                0
-                        </text>
+                        </text>
-                        <button label="Afficher" label_selected="Afficher" name="ShowGroup" />
+                        <button label="Afficher" label_selected="Afficher" name="ShowGroup" />
-                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..."
+                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..."
-                             tool_tip="Renvoyer les objets à leurs propriétaires." />
+                             tool_tip="Renvoyer les objets à leurs propriétaires." />
-                        <text type="string" length="1" name="Owned by others:">
+                        <text type="string" length="1" name="Owned by others:">
-                                Appartenant à d&apos;autres :
+                                Appartenant à d&apos;autres :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="other_objects_text">
+                        <text type="string" length="1" name="other_objects_text">
-                                0
+                                0
-                        </text>
+                        </text>
-                        <button label="Afficher" label_selected="Afficher" name="ShowOther" />
+                        <button label="Afficher" label_selected="Afficher" name="ShowOther" />
-                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..."
+                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..."
-                             tool_tip="Renvoyer les objets à leurs propriétaires." />
+                             tool_tip="Renvoyer les objets à leurs propriétaires." />
-                        <text type="string" length="1" name="Selected / sat upon:">
+                        <text type="string" length="1" name="Selected / sat upon:">
-                                Sélectionnés/où quelqu&apos;un est assis :
+                                Sélectionnés/où quelqu&apos;un est assis :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="selected_objects_text">
+                        <text type="string" length="1" name="selected_objects_text">
-                                0
+                                0
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
+                        <text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
-                                Renvoi automatique des objets appartenant aux autres résidents (minutes, 0 pour désactiver):
+                                Renvoi automatique des objets appartenant aux autres résidents (minutes, 0 pour désactiver):
-                        </text>
+                        </text>
-                        <text name="Autoreturn">
+                        <text name="Autoreturn">
-                                Renvoi automatique des objets d&apos;autres résidents (minutes, 0 pour désactiver) :
+                                Renvoi automatique des objets d&apos;autres résidents (minutes, 0 pour désactiver) :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Object Owners:">
+                        <text type="string" length="1" name="Object Owners:">
-                                Propriétaires :
+                                Propriétaires :
-                        </text>
+                        </text>
-                        <button label="Rafraîchir la liste" label_selected="Rafraîchir la liste"
+                        <button label="Rafraîchir la liste" label_selected="Rafraîchir la liste"
-                             name="Refresh List" />
+                             name="Refresh List" />
-                        <button label="Renvoyer les objets..." label_selected="Renvoyer les objets..."
+                        <button label="Renvoyer les objets..." label_selected="Renvoyer les objets..."
-                             name="Return objects..." />
+                             name="Return objects..." />
-                        <button label="" label_selected="" name="Type" tool_tip="Trier par type" />
+                        <button label="" label_selected="" name="Type" tool_tip="Trier par type" />
-                        <button label="Nom" label_selected="Nom" name="Name" tool_tip="Trier par nom" />
+                        <button label="Nom" label_selected="Nom" name="Name" tool_tip="Trier par nom" />
-                        <button label="Trafic" label_selected="Trafic" name="Count" tool_tip="Trier par trafic" />
+                        <button label="Trafic" label_selected="Trafic" name="Count" tool_tip="Trier par trafic" />
-                        <name_list label="Plus récents" name="owner list">
+                        <name_list label="Plus récents" name="owner list">
-                                <column label="Type" name="type" />
+                                <column label="Type" name="type" />
-                                <column label="Nom" name="name" />
+                                <column label="Nom" name="name" />
-                                <column label="Nombre" name="count" />
+                                <column label="Nombre" name="count" />
-                        </name_list>
+                        </name_list>
-                </panel>
+                </panel>
-                <panel label="Options" name="land_options_panel">
+                <panel label="Options" name="land_options_panel">
-                        <text type="string" length="1" name="allow_label">
+                        <text type="string" length="1" name="allow_label">
-                                Autoriser les autres résidents à :
+                                Autoriser les autres résidents à :
-                        </text>
+                        </text>
-                        <text name="allow_label2">
+                        <text name="allow_label2">
-                                Créer des objets :
+                                Créer des objets :
-                        </text>
+                        </text>
-                        <check_box label="Tous les résidents" name="edit objects check" />
+                        <check_box label="Tous les résidents" name="edit objects check" />
-                        <check_box label="Modifier le terrain" name="edit land check" />
+                        <check_box label="Modifier le terrain" name="edit land check" />
-                        <check_box label="Créer des repères" name="check landmark" />
+                        <check_box label="Créer des repères" name="check landmark" />
-                        <check_box label="Groupe" name="edit group objects check" />
+                        <check_box label="Groupe" name="edit group objects check" />
-                        <text name="allow_label3">
+                        <text name="allow_label3">
-                                Apporter des objets :
+                                Apporter des objets :
-                        </text>
+                        </text>
-                        <check_box label="Tous les résidents" name="all object entry check" />
+                        <check_box label="Tous les résidents" name="all object entry check" />
-                        <check_box label="Groupe" name="group object entry check" />
+                        <check_box label="Groupe" name="group object entry check" />
-                        <text name="allow_label4">
+                        <text name="allow_label4">
-                                Exécuter des scripts :
+                                Exécuter des scripts :
-                        </text>
+                        </text>
-                        <check_box label="Groupe" name="check group scripts" />
+                        <check_box label="Groupe" name="check group scripts" />
-                        <check_box label="Voler" name="check fly" />
+                        <check_box label="Voler" name="check fly" />
-                        <check_box label="Tous les résidents" name="check other scripts" />
+                        <check_box label="Tous les résidents" name="check other scripts" />
-                        <text type="string" length="1" name="land_options_label">
+                        <text type="string" length="1" name="land_options_label">
-                                Options du terrain :
+                                Options du terrain :
-                        </text>
+                        </text>
-                        <check_box label="Sécurisé (pas de dégâts)" name="check safe" />
+                        <check_box label="Sécurisé (pas de dégâts)" name="check safe" />
-                        <check_box label="Interdire les bousculades" name="PushRestrictCheck"
+                        <check_box label="Interdire les bousculades" name="PushRestrictCheck"
-                             tool_tip="llPushObject ne fonctionne que sur les scripts du propriétaire de la parcelle ou sur les scripts où la personne qui bouscule est aussi la propriétaire du script." />
+                             tool_tip="llPushObject ne fonctionne que sur les scripts du propriétaire de la parcelle ou sur les scripts où la personne qui bouscule est aussi la propriétaire du script." />
-                        <check_box label="Afficher dans la recherche (30 $L/semaine) sous"
+                        <check_box label="Afficher dans la recherche (30 $L/semaine) sous"
-                             name="ShowDirectoryCheck"
+                             name="ShowDirectoryCheck"
-                             tool_tip="Afficher la parcelle dans les résultats de recherche" />
+                             tool_tip="Afficher la parcelle dans les résultats de recherche" />
-                        <combo_box name="land category">
+                        <combo_box name="land category">
-                                <combo_item name="AnyCategory">
+                                <combo_item name="AnyCategory">
-                                        Toute catégorie
+                                        Toute catégorie
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="LindenLocation">
+                                <combo_item name="LindenLocation">
-                                        Emplacement Linden
+                                        Emplacement Linden
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Adult">
+                                <combo_item name="Adult">
-                                        Adultes
+                                        Adultes
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Arts&amp;Culture">
+                                <combo_item name="Arts&amp;Culture">
-                                        Art et Culture
+                                        Art et Culture
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Business">
+                                <combo_item name="Business">
-                                        Affaires
+                                        Affaires
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Educational">
+                                <combo_item name="Educational">
-                                        Éducation
+                                        Éducation
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Gaming">
+                                <combo_item name="Gaming">
-                                        Jeux
+                                        Jeux
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Hangout">
+                                <combo_item name="Hangout">
-                                        Endroit favori
+                                        Endroit favori
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="NewcomerFriendly">
+                                <combo_item name="NewcomerFriendly">
-                                        Convivial pour les nouveaux
+                                        Convivial pour les nouveaux
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Parks&amp;Nature">
+                                <combo_item name="Parks&amp;Nature">
-                                        Parcs et Nature
+                                        Parcs et Nature
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Residential">
+                                <combo_item name="Residential">
-                                        Résidentiel
+                                        Résidentiel
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Shopping">
+                                <combo_item name="Shopping">
-                                        Shopping
+                                        Shopping
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Other">
+                                <combo_item name="Other">
-                                        Autre
+                                        Autre
-                                </combo_item>
+                                </combo_item>
-                        </combo_box>
+                        </combo_box>
-                        <check_box label="Publier liste sur le web" name="PublishCheck"
+                        <check_box label="Publier liste sur le web" name="PublishCheck"
-                             tool_tip="Publiez vos informations de parcelle sur le web." />
+                             tool_tip="Publiez vos informations de parcelle sur le web." />
-                        <check_box label="Contenu pour adultes" name="MatureCheck"
+                        <check_box label="Contenu pour adultes" name="MatureCheck"
-                             tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." />
+                             tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." />
-                        <button label="?" label_selected="?" name="?" />
+                        <button label="?" label_selected="?" name="?" />
-                        <text type="string" length="1" name="Snapshot:">
+                        <text type="string" length="1" name="Snapshot:">
-                                Photo :
+                                Photo :
-                        </text>
+                        </text>
-                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" />
+                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" />
-                        <text type="string" length="1" name="Landing Point: (none)">
+                        <text type="string" length="1" name="Landing Point: (none)">
-                                Point d&apos;atterrissage : (aucun)
+                                Point d&apos;atterrissage : (aucun)
-                        </text>
+                        </text>
-                        <text name="landing_point">
+                        <text name="landing_point">
-                                Lieu d&apos;arrivée : [LANDING]
+                                Lieu d&apos;arrivée : [LANDING]
-                        </text>
+                        </text>
-                        <string name="landing_point_none">
+                        <string name="landing_point_none">
-                                (aucun)
+                                (aucun)
-                        </string>
+                        </string>
-                        <button label="Définir" label_selected="Définir" name="Set"
+                        <button label="Définir" label_selected="Définir" name="Set"
-                             tool_tip="Définir le lieu d&apos;arrivée de l&apos;avatar sur votre position actuelle. ll doit se trouver sur cette parcelle de terrain." />
+                             tool_tip="Définir le lieu d&apos;arrivée de l&apos;avatar sur votre position actuelle. ll doit se trouver sur cette parcelle de terrain." />
-                        <button label="Annuler" label_selected="Annuler" name="Clear"
+                        <button label="Annuler" label_selected="Annuler" name="Clear"
-                             tool_tip="Dégager le lieu d&apos;arrivée." />
+                             tool_tip="Dégager le lieu d&apos;arrivée." />
-                        <text type="string" length="1" name="Teleport Routing: ">
+                        <text type="string" length="1" name="Teleport Routing: ">
-                                Options de téléportation :
+                                Options de téléportation :
-                        </text>
+                        </text>
-                        <combo_box name="landing type"
+                        <combo_box name="landing type"
-                             tool_tip="Vous permet de paramétrer les téléportations sur votre terrain.">
+                             tool_tip="Vous permet de paramétrer les téléportations sur votre terrain.">
-                                <combo_item type="string" length="1" name="Blocked">
+                                <combo_item type="string" length="1" name="Blocked">
-                                        Bloquée
+                                        Bloquée
-                                </combo_item>
+                                </combo_item>
-                                <combo_item type="string" length="1" name="LandingPoint">
+                                <combo_item type="string" length="1" name="LandingPoint">
-                                        Lieu d&apos;arrivée défini
+                                        Lieu d&apos;arrivée défini
-                                </combo_item>
+                                </combo_item>
-                                <combo_item type="string" length="1" name="Anywhere">
+                                <combo_item type="string" length="1" name="Anywhere">
-                                        Lieu d&apos;arrivée indéfini
+                                        Lieu d&apos;arrivée indéfini
-                                </combo_item>
+                                </combo_item>
-                        </combo_box>
+                        </combo_box>
-                        <string name="push_restrict_text">
+                        <string name="push_restrict_text">
-                                Interdire les bousculades
+                                Interdire les bousculades
-                        </string>
+                        </string>
-                        <string name="push_restrict_region_text">
+                        <string name="push_restrict_region_text">
-                                Interdire les bousculades (passer outre les règles de la région)
+                                Interdire les bousculades (passer outre les règles de la région)
-                        </string>
+                        </string>
-                </panel>
+                </panel>
-                <panel label="Média" name="land_media_panel">
+                <panel label="Média" name="land_media_panel">
-                        <text name="with media:">
+                        <text name="with media:">
-                                Type de média :
+                                Type de média :
-                        </text>
+                        </text>
-                        <combo_box name="media type"
+                        <combo_box name="media type"
-                             tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre" />
+                             tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre" />
-                        <text name="at URL:">
+                        <text name="at URL:">
-                                URL du média :
+                                URL du média :
-                        </text>
+                        </text>
-                        <button label="Définir..." label_selected="Définir..." name="set_media_url" />
+                        <button label="Définir..." label_selected="Définir..." name="set_media_url" />
-                        <text name="Description:">
+                        <text name="Description:">
-                                Description :
+                                Description :
-                        </text>
+                        </text>
-                        <line_editor name="url_description"
+                        <line_editor name="url_description"
-                             tool_tip="Texte affiché à côté du bouton Jouer/Charger" />
+                             tool_tip="Texte affiché à côté du bouton Jouer/Charger" />
-                        <text name="replace_texture_help">
+                        <text name="replace_texture_help">
-                                (Les objets avec cette texture affichent le film ou 
+                                (Les objets avec cette texture affichent le film ou 
-la page web quand vous cliquez sur la flèche Jouer).
+la page web quand vous cliquez sur la flèche Jouer).
-                        </text>
+                        </text>
-                        <text name="Options:">
+                        <text name="Options:">
-                                Options
+                                Options
-média :
+média :
-                        </text>
+                        </text>
-                        <check_box label="Média en boucle" name="media_loop"
+                        <check_box label="Média en boucle" name="media_loop"
-                             tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera." />
+                             tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera." />
-                        <check_box label="Masquer l&apos;URL du média" name="hide_media_url"
+                        <check_box label="Masquer l&apos;URL du média" name="hide_media_url"
-                             tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML." />
+                             tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML." />
-                        <check_box label="Masquer l&apos;URL de la musique" name="hide_music_url"
+                        <check_box label="Masquer l&apos;URL de la musique" name="hide_music_url"
-                             tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL de la musique." />
+                             tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL de la musique." />
-                        <text name="media_size"
+                        <text name="media_size"
-                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut.">
+                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut.">
-                                Taille du média :
+                                Taille du média :
-                        </text>
+                        </text>
-                        <spinner name="media_size_width"
+                        <spinner name="media_size_width"
-                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
+                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
-                        <spinner name="media_size_height"
+                        <spinner name="media_size_height"
-                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
+                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
-                        <text name="pixels">
+                        <text name="pixels">
-                                pixels
+                                pixels
-                        </text>
+                        </text>
-                        <text name="MusicURL:">
+                        <text name="MusicURL:">
-                                URL de la musique :
+                                URL de la musique :
-                        </text>
+                        </text>
-                        <text name="Sound:">
+                        <text name="Sound:">
-                                Son :
+                                Son :
-                        </text>
+                        </text>
-                        <check_box label="Limiter le son spatial à cette parcelle" name="check sound local" />
+                        <check_box label="Limiter le son spatial à cette parcelle" name="check sound local" />
-                        <text type="string" length="1" name="Music URL:">
+                        <text type="string" length="1" name="Music URL:">
-                                URL du flux :
+                                URL du flux :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Media texture:">
+                        <text type="string" length="1" name="Media texture:">
-                                Remplacer
+                                Remplacer
-la texture :
+la texture :
-                        </text>
+                        </text>
-                        <text type="string" length="1" name="Replace this texture:">
+                        <text type="string" length="1" name="Replace this texture:">
-                                Remplacer cette texture :
+                                Remplacer cette texture :
-                        </text>
+                        </text>
-                        <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" />
+                        <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" />
-                        <text type="string" length="1" name="with content from this URL:">
+                        <text type="string" length="1" name="with content from this URL:">
-                                par du contenu situé à l&apos;URL suivante :
+                                par du contenu situé à l&apos;URL suivante :
-                        </text>
+                        </text>
-                        <check_box label="Échelle automatique" name="media_auto_scale"
+                        <check_box label="Échelle automatique" name="media_auto_scale"
-                             tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement." />
+                             tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement." />
-                        <text name="Voice settings:">
+                        <text name="Voice settings:">
-                                Voix :
+                                Voix :
-                        </text>
+                        </text>
-                        <radio_group name="parcel_voice_channel">
+                        <radio_group name="parcel_voice_channel">
-                                <radio_item name="Estate">
+                                <radio_item name="Estate">
-                                        Utiliser le canal spatial du domaine
+                                        Utiliser le canal spatial du domaine
-                                </radio_item>
+                                </radio_item>
-                                <radio_item name="Private">
+                                <radio_item name="Private">
-                                        Utiliser un canal spatial privé
+                                        Utiliser un canal spatial privé
-                                </radio_item>
+                                </radio_item>
-                                <radio_item name="Disabled">
+                                <radio_item name="Disabled">
-                                        Désactiver les canaux spatiaux audios sur cette parcelle
+                                        Désactiver les canaux spatiaux audios sur cette parcelle
-                                </radio_item>
+                                </radio_item>
-                        </radio_group>
+                        </radio_group>
-                </panel>
+                </panel>
-                <panel label="Accès" name="land_access_panel">
+                <panel label="Accès" name="land_access_panel">
-                        <text type="string" length="1" name="Limit access to this parcel to:">
+                        <text type="string" length="1" name="Limit access to this parcel to:">
-                                Accès à cette parcelle
+                                Accès à cette parcelle
-                        </text>
+                        </text>
-                        <check_box label="Autoriser l&apos;accès public" name="public_access" />
+                        <check_box label="Autoriser l&apos;accès public" name="public_access" />
-                        <text name="Only Allow">
+                        <text name="Only Allow">
-                                Bloquer l&apos;accès :
+                                Bloquer l&apos;accès :
-                        </text>
+                        </text>
-                        <check_box
+                        <check_box
-                             label="Aux résidents qui n&apos;ont pas fourni leurs informations de paiement à Linden Lab"
+                             label="Aux résidents qui n&apos;ont pas fourni leurs informations de paiement à Linden Lab"
-                             name="limit_payment" tool_tip="Aux résidents non identifés" />
+                             name="limit_payment" tool_tip="Aux résidents non identifés" />
-                        <check_box label="Aux résidents dont l&apos;âge n&apos;a pas été vérifié"
+                        <check_box label="Aux résidents dont l&apos;âge n&apos;a pas été vérifié"
-                             name="limit_age_verified"
+                             name="limit_age_verified"
-                             tool_tip="Aux résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com." />
+                             tool_tip="Aux résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com." />
-                        <string name="estate_override">
+                        <string name="estate_override">
-                                Au moins une de ces options est définie au niveau du domaine.
+                                Au moins une de ces options est définie au niveau du domaine.
-                        </string>
+                        </string>
-                        <check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck"
+                        <check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck"
-                             tool_tip="Définir le groupe à l&apos;onglet Général." />
+                             tool_tip="Définir le groupe à l&apos;onglet Général." />
-                        <check_box label="Avatars : (0 dans la liste, 300 max)" name="AccessCheck" />
+                        <check_box label="Avatars : (0 dans la liste, 300 max)" name="AccessCheck" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
+                        <button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
-                        <button label="Retirer" label_selected="Retirer" name="Remove" />
+                        <button label="Retirer" label_selected="Retirer" name="Remove" />
-                        <check_box label="Vendre des passes à :" name="PassCheck"
+                        <check_box label="Vendre des passes à :" name="PassCheck"
-                             tool_tip="Autoriser un accès temporaire à cette parcelle" />
+                             tool_tip="Autoriser un accès temporaire à cette parcelle" />
-                        <combo_box name="pass_combo">
+                        <combo_box name="pass_combo">
-                                <combo_item name="Anyone">
+                                <combo_item name="Anyone">
-                                        N&apos;importe qui
+                                        N&apos;importe qui
-                                </combo_item>
+                                </combo_item>
-                                <combo_item name="Group">
+                                <combo_item name="Group">
-                                        Groupe
+                                        Groupe
-                                </combo_item>
+                                </combo_item>
-                        </combo_box>
+                        </combo_box>
-                        <spinner label="Prix en $L :" name="PriceSpin" />
+                        <spinner label="Prix en $L :" name="PriceSpin" />
-                        <spinner label="Heures d&apos;accès :" name="HoursSpin" />
+                        <spinner label="Heures d&apos;accès :" name="HoursSpin" />
-                        <text label="Toujours autoriser" name="AllowedText">
+                        <text label="Toujours autoriser" name="AllowedText">
-                                Résidents autorisés
+                                Résidents autorisés
-                        </text>
+                        </text>
-                        <name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)" />
+                        <name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="add_allowed" />
+                        <button label="Ajouter..." label_selected="Ajouter..." name="add_allowed" />
-                        <button label="Supprimer" label_selected="Supprimer" name="remove_allowed" />
+                        <button label="Supprimer" label_selected="Supprimer" name="remove_allowed" />
-                        <text label="Interdire" name="BanCheck">
+                        <text label="Interdire" name="BanCheck">
-                                Résidents interdits
+                                Résidents interdits
-                        </text>
+                        </text>
-                        <name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)" />
+                        <name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="add_banned" />
+                        <button label="Ajouter..." label_selected="Ajouter..." name="add_banned" />
-                        <button label="Supprimer" label_selected="Supprimer" name="remove_banned" />
+                        <button label="Supprimer" label_selected="Supprimer" name="remove_banned" />
-                </panel>
+                </panel>
-                <panel label="Bannir" name="land_ban_panel">
+                <panel label="Bannir" name="land_ban_panel">
-                        <check_box label="Bannir les avatars suivants : (0 dans la liste, 300 max)"
+                        <check_box label="Bannir les avatars suivants : (0 dans la liste, 300 max)"
-                             name="LandBanCheck" />
+                             name="LandBanCheck" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
+                        <button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
-                        <button label="Retirer" label_selected="Retirer" name="Remove" />
+                        <button label="Retirer" label_selected="Retirer" name="Remove" />
-                        <text type="string" length="1" name="Deny by Payment Status:">
+                        <text type="string" length="1" name="Deny by Payment Status:">
-                                Refuser selon les infos de paiement :
+                                Refuser selon les infos de paiement :
-                        </text>
+                        </text>
-                        <check_box label="Refuser sans infos de paiement enregistrées" name="DenyAnonymousCheck" />
+                        <check_box label="Refuser sans infos de paiement enregistrées" name="DenyAnonymousCheck" />
-                        <check_box label="Refuser avec infos de paiement enregistrées" name="DenyIdentifiedCheck" />
+                        <check_box label="Refuser avec infos de paiement enregistrées" name="DenyIdentifiedCheck" />
-                        <check_box label="Refuser avec infos de paiement utilisées" name="DenyTransactedCheck" />
+                        <check_box label="Refuser avec infos de paiement utilisées" name="DenyTransactedCheck" />
-                </panel>
+                </panel>
-        </tab_container>
+        </tab_container>
-</floater>
+</floater>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 623b800..b6e77be 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -100,9 +100,9 @@
 <PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
 
 <!-- MENU BAR -->
-<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
+<ParcelTextColor value="40, 40, 90, 255" />               <!-- Parcel name on menu bar, normal state -->
 <ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
+<TimeTextColor value="0, 30, 60, 255" />                    <!-- SL Time on menu bar -->
 <BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
 <HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
 
@@ -175,14 +175,6 @@
 <FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
 <InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
 
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="0, 0, 0, 255" />
-<HelpScrollThumbColor value="255, 255, 255, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
 <!-- MISC -->
 <AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
 <FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
@@ -192,5 +184,5 @@
 <ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
 <GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
 <ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
- 
 </settings>
diff --git a/linden/install.xml b/linden/install.xml
index 4d2b5d0..fd8f6ff 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -390,13 +390,6 @@
            <key>url</key>
            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2</uri>
          </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>3d5e29d444dde4815b36082eedfc775a</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-windows-20080817.tar.bz2</uri>
-          </map>
        </map>
      </map>
      <key>google</key>
diff --git a/linden/scripts/messages/message_template.msg b/linden/scripts/messages/message_template.msg
index a7835ad..6d90622 100644
--- a/linden/scripts/messages/message_template.msg
+++ b/linden/scripts/messages/message_template.msg
@@ -2942,6 +2942,14 @@ version 2.0
                {       UseEstateSun            BOOL            }
                {       SunHour                         F32                     }       // last value set by estate or region controls JC
        }
+        {
+                RegionInfo2             Single
+                {       ProductSKU                      Variable 1      }       // string
+                {       ProductName                     Variable 1      }       // string
+                {       MaxAgents32                     U32                     }       // Identical to RegionInfo.MaxAgents but allows greater range
+                {       HardMaxAgents           U32                     }
+                {       HardMaxObjects          U32                     }
+        }
 }
 // GodUpdateRegionInfo
@@ -3059,6 +3067,14 @@ version 2.0
                RegionInfo2     Single
                {       RegionID                LLUUID  }
        }
+        {
+                RegionInfo3     Single
+                {       CPUClassID                              S32             }
+                {       CPURatio                                S32             }
+                {       ColoName                                Variable        1       }       // string
+                {       ProductSKU                              Variable        1       }       // string
+                {       ProductName                             Variable        1       }       // string
+        }
 }
 // RegionHandshakeReply
@@ -8854,3 +8870,39 @@ version 2.0
        }
 }
+// This message is sent from viewer -> simulator when the viewer wants
+// to rez an object out of inventory back to its position before it
+// last moved into the inventory
+{
+        RezRestoreToWorld Low 425 NotTrusted Unencoded UDPDeprecated
+        {
+                AgentData               Single
+                {       AgentID         LLUUID  }
+                {       SessionID       LLUUID  }
+        }
+        {
+                InventoryData                   Single
+                {       ItemID                          LLUUID  }
+                {       FolderID                        LLUUID  }
+                {       CreatorID                       LLUUID  }       // permissions
+                {       OwnerID                         LLUUID  }       // permissions
+                {       GroupID                         LLUUID  }       // permissions
+                {       BaseMask                        U32     }       // permissions
+                {       OwnerMask                       U32     }       // permissions
+                {       GroupMask                       U32     }       // permissions
+                {       EveryoneMask            U32     }       // permissions
+                {       NextOwnerMask           U32     }       // permissions
+                {       GroupOwned                      BOOL    }       // permissions
+                {       TransactionID           LLUUID  }
+                {       Type                            S8      }
+                {       InvType                         S8      }
+                {       Flags                           U32     }
+                {       SaleType                        U8      }
+                {       SalePrice                       S32     }
+                {       Name                            Variable        1       }
+                {       Description                     Variable        1       }
+                {       CreationDate            S32     }
+                {       CRC                             U32     }
+        }
+}