Second Life viewer sources 1.19.1.0

9 files changed, 379 insertions, 15 deletions

diff --git a/linden/indra/lib/python/indra/base/config.py b/linden/indra/lib/python/indra/base/config.py
index eea733a..3865f5e 100644
--- a/linden/indra/lib/python/indra/base/config.py
+++ b/linden/indra/lib/python/indra/base/config.py
@@ -47,6 +47,25 @@ def load(indra_xml_file=None):
         config_file.close()
         #print "loaded config from",indra_xml_file,"into",_g_config_dict
 
+def dump(indra_xml_file, indra_cfg={}, update_in_mem=False):
+    '''
+    Dump config contents into a file
+    Kindof reverse of load.
+    Optionally takes a new config to dump.
+    Does NOT update global config unless requested.
+    '''
+    global _g_config_dict
+    if not indra_cfg:
+        indra_cfg = _g_config_dict
+    if not indra_cfg:
+        return
+    config_file = open(indra_xml_file, 'w')
+    _config_xml = llsd.format_xml(indra_cfg)
+    config_file.write(_config_xml)
+    config_file.close()
+    if update_in_mem:
+        update(indra_cfg)
+
 def update(new_conf):
     """Load an XML file and apply its map as overrides or additions
     to the existing config.  The dataserver does this with indra.xml
@@ -69,6 +88,12 @@ def get(key, default = None):
         load()
     return _g_config_dict.get(key, default)
 
+def set(key, newval):
+    global _g_config_dict
+    if _g_config_dict == None:
+        load()
+    _g_config_dict[key] = newval
+
 def as_dict():
     global _g_config_dict
     return _g_config_dict
diff --git a/linden/indra/lib/python/indra/base/lllog.py b/linden/indra/lib/python/indra/base/lllog.py
new file mode 100644
index 0000000..99c50ef
--- /dev/null
+++ b/linden/indra/lib/python/indra/base/lllog.py
@@ -0,0 +1,72 @@
+"""\
+@file lllog.py
+@brief Logging for event processing
+
+$LicenseInfo:firstyear=2008&license=mit$
+
+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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+$/LicenseInfo$
+"""
+
+from indra.base.llsd import format_notation
+
+try:
+    import syslog
+except ImportError:
+    # Windows
+    import sys
+
+    class syslog(object):
+        _logfp = sys.stderr
+
+        def syslog(msg):
+            _logfp.write(msg)
+            if not msg.endswith('\n'):
+                _logfp.write('\n')
+
+        syslog = staticmethod(syslog)
+
+class Logger(object):
+    def __init__(self, name='indra'):
+        self._sequence = 0
+        try:
+            syslog.openlog(name, syslog.LOG_CONS | syslog.LOG_PID,
+                           syslog.LOG_LOCAL0)
+        except AttributeError:
+            # No syslog module on Windows
+            pass
+
+    def next(self):
+        self._sequence += 1
+        return self._sequence
+
+    def log(self, msg, llsd):
+        payload = 'LLLOGMESSAGE (%d) %s %s' % (self.next(), msg,
+                                               format_notation(llsd))
+        syslog.syslog(payload)
+
+_logger = None
+
+def log(msg, llsd):
+    global _logger
+    if _logger is None:
+        _logger = Logger()
+    _logger.log(msg, llsd)
diff --git a/linden/indra/lib/python/indra/base/lluuid.py b/linden/indra/lib/python/indra/base/lluuid.py
index f173310..dd336f0 100644
--- a/linden/indra/lib/python/indra/base/lluuid.py
+++ b/linden/indra/lib/python/indra/base/lluuid.py
@@ -227,16 +227,31 @@ def printTranslatedMemory(four_hex_uints):
     uuid.setFromMemoryDump(four_hex_uints)
     print uuid.toString()
 
-def isPossiblyID(id_str):
+def isUUID(id_str):
     """
-    This function returns 1 if the string passed has some uuid-like
-    characteristics. Otherwise returns 0.
+    This function returns:
+    - 1 if the string passed is a UUID
+    - 0 is the string passed is not a UUID
+    - None if it neither of the if's below is satisfied
     """
     if not id_str or len(id_str) <  5 or len(id_str) > 36:
         return 0
 
     if isinstance(id_str, UUID) or UUID.uuid_regex.match(id_str):
         return 1
+
+    return None
+
+def isPossiblyID(id_str):
+    """
+    This function returns 1 if the string passed has some uuid-like
+    characteristics. Otherwise returns 0.
+    """
+
+    is_uuid = isUUID(id_str)
+    if is_uuid is not None:
+        return is_uuid
+
     # build a string which matches every character.
     hex_wildcard = r"[0-9a-fA-F]"
     chars = len(id_str)
diff --git a/linden/indra/lib/python/indra/base/metrics.py b/linden/indra/lib/python/indra/base/metrics.py
index e640c45..04e6286 100644
--- a/linden/indra/lib/python/indra/base/metrics.py
+++ b/linden/indra/lib/python/indra/base/metrics.py
@@ -31,12 +31,23 @@ $/LicenseInfo$
 import sys
 from indra.base import llsd
 
-def log(location, stats, file=None):
-    "Write a standard llmetrics log"
-    metrics = {'location':location, 'stats':stats}
-    if file is None:
+_sequence_id = 0
+
+def record_metrics(table, stats, dest=None):
+    "Write a standard metrics log"
+    _log("LLMETRICS", table, stats, dest)
+
+def record_event(table, data, dest=None):
+    "Write a standard logmessage log"
+    _log("LLLOGMESSAGE", table, data, dest)
+
+def _log(header, table, data, dest):
+    if dest is None:
         # do this check here in case sys.stdout changes at some
         # point. as a default parameter, it will never be
         # re-evaluated.
-        file = sys.stdout
-    print >>file, "LLMETRICS:", llsd.format_notation(metrics)
+        dest = sys.stdout
+    global _sequence_id
+    print >>dest, header, "(" + str(_sequence_id) + ")",
+    print >>dest, table, llsd.format_notation(data)
+    _sequence_id += 1
diff --git a/linden/indra/lib/python/indra/ipc/mysql_pool.py b/linden/indra/lib/python/indra/ipc/mysql_pool.py
index 0a06cdd..01e31bb 100644
--- a/linden/indra/lib/python/indra/ipc/mysql_pool.py
+++ b/linden/indra/lib/python/indra/ipc/mysql_pool.py
@@ -64,12 +64,13 @@ connection pools keyed on host,databasename"""
         else:
             return self._credentials.get('default', None)
 
-    def get(self, host, dbname):
-        key = (host, dbname)
+    def get(self, host, dbname, port=3306):
+        key = (host, dbname, port)
         if key not in self._databases:
             new_kwargs = self._kwargs.copy()
             new_kwargs['db'] = dbname
             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)
             self._databases[key] = dbpool
diff --git a/linden/indra/lib/python/indra/ipc/russ.py b/linden/indra/lib/python/indra/ipc/russ.py
index a198acf..fbb1777 100644
--- a/linden/indra/lib/python/indra/ipc/russ.py
+++ b/linden/indra/lib/python/indra/ipc/russ.py
@@ -136,7 +136,15 @@ def _build_query_string(query_dict):
     @returns Returns an urlencoded query string including leading '?'.
     """
     if query_dict:
-        return '?' + urllib.urlencode(query_dict)
+        keys = query_dict.keys()
+        keys.sort()
+        def stringize(value):
+            if type(value) in (str,unicode):
+                return value
+            else:
+                return str(value)
+        query_list = [urllib.quote(str(key)) + '=' + urllib.quote(stringize(query_dict[key])) for key in keys]
+        return '?' + '&'.join(query_list)
     else:
         return ''
 
diff --git a/linden/indra/lib/python/indra/util/llsubprocess.py b/linden/indra/lib/python/indra/util/llsubprocess.py
new file mode 100644
index 0000000..1c107d9
--- /dev/null
+++ b/linden/indra/lib/python/indra/util/llsubprocess.py
@@ -0,0 +1,106 @@
+"""\
+@file llsubprocess.py
+@author Phoenix
+@date 2008-01-18
+@brief The simplest possible wrapper for a common sub-process paradigm.
+
+$LicenseInfo:firstyear=2007&license=mit$
+
+Copyright (c) 2007-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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+$/LicenseInfo$
+"""
+
+import os
+import popen2
+import time
+import select
+
+class Timeout(RuntimeError):
+    "Exception raised when a subprocess times out."
+    pass
+
+def run(command, args=None, data=None, timeout=None):
+    """\
+@brief Run command with arguments
+
+This is it. This is the function I want to run all the time when doing
+subprocces, but end up copying the code everywhere. none of the
+standard commands are secure and provide a way to specify input, get
+all the output, and get the result.
+@param command A string specifying a process to launch.
+@param args Arguments to be passed to command. Must be list, tuple or None.
+@param data input to feed to the command.
+@param timeout Maximum number of many seconds to run.
+@return Returns (result, stdout, stderr) from process.
+"""
+    cmd = [command]
+    if args:
+        cmd.extend([str(arg) for arg in args])
+    #print  "cmd: ","' '".join(cmd)
+    child = popen2.Popen3(cmd, True)
+    #print child.pid
+    out = []
+    err = []
+    result = -1
+    time_left = timeout
+    tochild = [child.tochild.fileno()]
+    while True:
+        time_start = time.time()
+        #print "time:",time_left
+        p_in, p_out, p_err = select.select(
+            [child.fromchild.fileno(), child.childerr.fileno()],
+            tochild,
+            [],
+            time_left)
+        if p_in:
+            new_line = os.read(child.fromchild.fileno(), 32 * 1024)
+            if new_line:
+                #print "line:",new_line
+                out.append(new_line)
+            new_line = os.read(child.childerr.fileno(), 32 * 1024)
+            if new_line:
+                #print "error:", new_line
+                err.append(new_line)
+        if p_out:
+            if data:
+                #print "p_out"
+                bytes = os.write(child.tochild.fileno(), data)
+                data = data[bytes:]
+                if len(data) == 0:
+                    data = None
+                    tochild = []
+                    child.tochild.close()
+        result = child.poll()
+        if result != -1:
+            child.tochild.close()
+            child.fromchild.close()
+            child.childerr.close()
+            break
+        if time_left is not None:
+            time_left -= (time.time() - time_start)
+            if time_left < 0:
+                raise Timeout
+    #print "result:",result
+    out = ''.join(out)
+    #print "stdout:", out
+    err = ''.join(err)
+    #print "stderr:", err
+    return result, out, err
diff --git a/linden/indra/lib/python/indra/util/named_query.py b/linden/indra/lib/python/indra/util/named_query.py
index c462d9f..c52bfde 100644
--- a/linden/indra/lib/python/indra/util/named_query.py
+++ b/linden/indra/lib/python/indra/util/named_query.py
@@ -495,9 +495,51 @@ class _RewriteQueryForArray(object):
         if type(value) in (list,tuple):
             rv = []
             for idx in range(len(value)):
-                new_key = "_" + key + "_" + str(idx)
-                self.new_params[new_key] = value[idx]
-                rv.append("%(" + new_key + ")s")
+                # if the value@idx is array-like, we are
+                # probably dealing with a VALUES
+                new_key = "_%s_%s"%(key, str(idx))
+                val_item = value[idx]
+                if type(val_item) in (list, tuple, dict):
+                    if type(val_item) is dict:
+                        # this is because in Python, the order of 
+                        # key, value retrieval from the dict is not
+                        # guaranteed to match what the input intended
+                        # and for VALUES, order is important.
+                        # TODO: Implemented ordered dict in LLSD parser?
+                        raise ExpectationFailed('Only lists/tuples allowed,\
+                                received dict')
+                    values_keys = []
+                    for value_idx, item in enumerate(val_item):
+                        # we want a key of the format :
+                        # key_#replacement_#value_row_#value_col
+                        # ugh... so if we are replacing 10 rows in user_note, 
+                        # the first values clause would read (for @:user_notes) :-
+                        # ( :_user_notes_0_1_1,  :_user_notes_0_1_2, :_user_notes_0_1_3 )
+                        # the input LLSD for VALUES will look like:
+                        # <llsd>...
+                        # <map>
+                        #  <key>user_notes</key>
+                        #      <array>
+                        #      <array> <!-- row 1 for VALUES -->
+                        #          <string>...</string>
+                        #          <string>...</string>
+                        #          <string>...</string>
+                        #      </array>
+                        # ...
+                        #      </array>
+                        # </map>
+                        # ... </llsd>
+                        values_key = "%s_%s"%(new_key, value_idx)
+                        self.new_params[values_key] = item
+                        values_keys.append("%%(%s)s"%values_key)
+                    # now collapse all these new place holders enclosed in ()
+                    # from [':_key_0_1_1', ':_key_0_1_2', ':_key_0_1_3,...] 
+                    # rv will have [ '(:_key_0_1_1, :_key_0_1_2, :_key_0_1_3)', ]
+                    # which is flattened a few lines below join(rv)
+                    rv.append('(%s)' % ','.join(values_keys))
+                else:
+                    self.new_params[new_key] = val_item
+                    rv.append("%%(%s)s"%new_key)
             return ','.join(rv)
         else:
             # not something that can be expanded, so just drop the
diff --git a/linden/indra/lib/python/indra/util/shutil2.py b/linden/indra/lib/python/indra/util/shutil2.py
new file mode 100644
index 0000000..2c504c2
--- /dev/null
+++ b/linden/indra/lib/python/indra/util/shutil2.py
@@ -0,0 +1,84 @@
+'''
+@file shutil2.py
+@brief a better shutil.copytree replacement
+
+$LicenseInfo:firstyear=2007&license=mit$
+
+Copyright (c) 2007-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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+$/LicenseInfo$
+'''
+
+#
+# shutil2.py
+# Taken from http://www.scons.org/wiki/AccumulateBuilder
+# the stock copytree sucks because it insists that the
+# target dir not exist
+#
+
+import os.path
+import shutil
+
+def copytree(src, dest, symlinks=False):
+    """My own copyTree which does not fail if the directory exists.
+    
+    Recursively copy a directory tree using copy2().
+
+    If the optional symlinks flag is true, symbolic links in the
+    source tree result in symbolic links in the destination tree; if
+    it is false, the contents of the files pointed to by symbolic
+    links are copied.
+    
+    Behavior is meant to be identical to GNU 'cp -R'.    
+    """
+    def copyItems(src, dest, symlinks=False):
+        """Function that does all the work.
+        
+        It is necessary to handle the two 'cp' cases:
+        - destination does exist
+        - destination does not exist
+        
+        See 'cp -R' documentation for more details
+        """
+        for item in os.listdir(src):
+           srcPath = os.path.join(src, item)
+           if os.path.isdir(srcPath):
+               srcBasename = os.path.basename(srcPath)
+               destDirPath = os.path.join(dest, srcBasename)
+               if not os.path.exists(destDirPath):
+                   os.makedirs(destDirPath)
+               copyItems(srcPath, destDirPath)
+           elif os.path.islink(item) and symlinks:
+               linkto = os.readlink(item)
+               os.symlink(linkto, dest)
+           else:
+               shutil.copy2(srcPath, dest)
+
+    # case 'cp -R src/ dest/' where dest/ already exists
+    if os.path.exists(dest):
+       destPath = os.path.join(dest, os.path.basename(src))
+       if not os.path.exists(destPath):
+           os.makedirs(destPath)
+    # case 'cp -R src/ dest/' where dest/ does not exist
+    else:
+       os.makedirs(dest)
+       destPath = dest
+    # actually copy the files
+    copyItems(src, destPath)