Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

430 files changed, 4366 insertions, 2381 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1177fc2..6a97391 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -24,6 +24,11 @@ list(REMOVE_DUPLICATES TYPES)
 set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
 unset(TYPES)
 
+# Work around nmake / VS difference.
+set(VIEWER_CFG_INTDIR ${CMAKE_CFG_INTDIR})
+if (NMAKE)
+    set(VIEWER_CFG_INTDIR ${CMAKE_BUILD_TYPE})
+endif(NMAKE)
 
 # Determine the number of bits of this processor
 
@@ -68,7 +73,6 @@ if (WINDOWS)
       /DUNICODE
       /D_UNICODE 
       /GS
-      /TP
       /W3
       /c
       /Zc:forScope
@@ -95,9 +99,10 @@ if (WINDOWS)
   endif (MSVC80 OR MSVC90)
   
   # Are we using the crummy Visual Studio KDU build workaround?
-  if (NOT VS_DISABLE_FATAL_WARNINGS)
-    add_definitions(/WX)
-  endif (NOT VS_DISABLE_FATAL_WARNINGS)
+  # FIXME: Let's just disable this for now, see if it's needed, coz I have no idea what that work around is about.
+#  if (NOT VS_DISABLE_FATAL_WARNINGS)
+#    add_definitions(/WX)
+#  endif (NOT VS_DISABLE_FATAL_WARNINGS)
 endif (WINDOWS)
 
 
diff --git a/linden/indra/cmake/CMakeLists.txt b/linden/indra/cmake/CMakeLists.txt
index 4a7d633..aca7b5a 100644
--- a/linden/indra/cmake/CMakeLists.txt
+++ b/linden/indra/cmake/CMakeLists.txt
@@ -93,7 +93,6 @@ set(cmake_SOURCE_FILES
         UI.cmake
         UnixInstall.cmake
         Variables.cmake
-        ViewerArtwork.cmake
         ViewerMiscLibs.cmake
         WebKitLibPlugin.cmake
         XmlRpcEpi.cmake
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 88c0c5c..dfb0e70 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -81,10 +81,19 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
+
+  # Incorporated settings from
+  # http://imprudenceviewer.org/w/index.php?title=How_to_compile&oldid=1647#Mac
+  # so that people don't have to set them every time they run develop.py
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION  "4.0")
+  set(CMAKE_XCODE_ATTRIBUTE_ARCHS '$(ARCHS_STANDARD_32_BIT)')
+  set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS "i386 ppc")
+  # set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
+
   # set this dynamically from the build system now -
   # NOTE: wont have a distributable build unless you add this on the configure line with:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(CMAKE_OSX_ARCHITECTURES i386;ppc)
   set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
   if (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
     set(ARCH i386)
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake
deleted file mode 100644
index 20210fc..0000000
--- a/linden/indra/cmake/ViewerArtwork.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- cmake -*-
-#
-# Download viewer artwork even when using standalone
-
-include(Variables)
-include(Prebuilt)
-
-if (NOT STANDALONE)
-  use_prebuilt_binary(artwork)
-  use_prebuilt_binary(fonts)
-else (NOT STANDALONE)
-  set(STANDALONE OFF)
-    use_prebuilt_binary(artwork)
-    use_prebuilt_binary(fonts)
-  set(STANDALONE ON)
-endif (NOT STANDALONE)
diff --git a/linden/indra/cmake/gpg.vs.cmake b/linden/indra/cmake/gpg.vs.cmake
index a5220f4..c551b3a 100644
--- a/linden/indra/cmake/gpg.vs.cmake
+++ b/linden/indra/cmake/gpg.vs.cmake
@@ -4,3 +4,4 @@
 # make the libgcrypt, libgpg-error, and libotr compile.
 
 set(gpg.vs_INCLUDE_DIRS )
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libgcrypt.cmake b/linden/indra/cmake/libgcrypt.cmake
index 4d19467..19ef1f8 100644
--- a/linden/indra/cmake/libgcrypt.cmake
+++ b/linden/indra/cmake/libgcrypt.cmake
@@ -2,9 +2,19 @@
 
 set(LIBGCRYPT_INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}/libgcrypt/include
+    ${LIBS_OPEN_DIR}/libgcrypt/libgcrypt-1.2.2/src
     )
 
+if (DARWIN OR LINUX)
 set(LIBGCRYPT_LIBRARIES
     ${CMAKE_BINARY_DIR}/libgcrypt/lib/libgcrypt.a
     )
+endif (DARWIN OR LINUX)
 
+if (WINDOWS)
+set(LIBGCRYPT_LIBRARIES
+    ${CMAKE_BINARY_DIR}/libgcrypt/gcrypt.lib
+    )
+endif (WINDOWS)
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libgpg-error.cmake b/linden/indra/cmake/libgpg-error.cmake
index 417ad19..4ec0926 100644
--- a/linden/indra/cmake/libgpg-error.cmake
+++ b/linden/indra/cmake/libgpg-error.cmake
@@ -2,9 +2,19 @@
 
 set(LIBGPG-ERROR_INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}/libgpg-error/include
+    ${LIBS_OPEN_DIR}/libgpg-error/libgpg-error-1.0/src
     )
 
+if (DARWIN OR LINUX)
 set(LIBGPG-ERROR_LIBRARIES
     ${CMAKE_BINARY_DIR}/libgpg-error/lib/libgpg-error.a
     )
+endif (DARWIN OR LINUX)
 
+if (WINDOWS)
+set(LIBGPG-ERROR_LIBRARIES
+    ${CMAKE_BINARY_DIR}/libgpg-error/gpg-error.lib
+    )
+endif (WINDOWS)
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libotr.cmake b/linden/indra/cmake/libotr.cmake
index 30544f8..6fd61f2 100644
--- a/linden/indra/cmake/libotr.cmake
+++ b/linden/indra/cmake/libotr.cmake
@@ -6,3 +6,5 @@ set(LIBOTR_INCLUDE_DIRS
 set(LIBOTR_LIBRARIES
     otr
     )
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libotrb.cmake b/linden/indra/cmake/libotrb.cmake
index eb8522f..e9290e8 100644
--- a/linden/indra/cmake/libotrb.cmake
+++ b/linden/indra/cmake/libotrb.cmake
@@ -2,3 +2,5 @@
 include(Prebuilt)
 
 set(OTR_LIBRARY otr)
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index ffe8e61..100f719 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -416,7 +416,7 @@ class LinuxSetup(UnixSetup):
             print 'Running %r' % cmd
             self.run(cmd)
 
-        
+
 class DarwinSetup(UnixSetup):
     def __init__(self):
         super(DarwinSetup, self).__init__()
@@ -443,7 +443,12 @@ class DarwinSetup(UnixSetup):
             type=self.build_type
             )
         if self.universal == 'ON':
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+        elif self.arch == 'ppc':
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'ppc\''
+        else:
             args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386\''
+
         #if simple:
         #    return 'cmake %(opts)s %(dir)r' % args
         return ('cmake -G %(generator)r '
@@ -488,6 +493,10 @@ class WindowsSetup(PlatformSetup):
         'vc100' : {
             'gen' : r'Visual Studio 10',
             'ver' : r'10.0'
+            },
+        'nmake' : {
+            'gen' : r'NMake Makefiles',
+            'ver' : r''
             }
         }
     gens['vs2003'] = gens['vc71']
@@ -503,6 +512,41 @@ class WindowsSetup(PlatformSetup):
         self._generator = None
         self.incredibuild = False
 
+    def find_visual_studio(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
+                       self.gens[gen]['ver'])
+            value_str = (r'EnvironmentDirectory')
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            return ''
+
+    def find_visual_studio_express(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"vcpackages"
+            print 'Found: %s' % value
+            self.using_express = True
+            return value
+        except WindowsError, err:
+            return ''
+
     def _get_generator(self):
         if self._generator is None:
             for version in 'vc80 vc90 vc100 vc71'.split():
@@ -511,9 +555,8 @@ class WindowsSetup(PlatformSetup):
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
-                print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
                 for version in 'vc80 vc90 vc100 vc71'.split():
-                    if self.find_visual_studio_express(version):
+                    if self.find_visual_studio_express(version) != '':
                         self._generator = version
                         self.using_express = True
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
@@ -524,6 +567,8 @@ class WindowsSetup(PlatformSetup):
         return self._generator
 
     def _set_generator(self, gen):
+        if gen == 'nmake':
+            self._get_generator()
         self._generator = gen
 
     generator = property(_get_generator, _set_generator)
@@ -541,83 +586,58 @@ class WindowsSetup(PlatformSetup):
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
-            project_name=self.project_name
+            project_name=self.project_name,
+            type=self.build_type,
+            use_vstool='ON',
+            nmake=''
             )
+        if self.generator == 'nmake':
+           args['use_vstool'] = 'OFF'
+           args['nmake'] = '-DNMAKE:BOOL=ON'
+        if self.using_express:
+           args['using_express'] = 'ON'
+           args['use_vstool'] = 'OFF'
+        else:
+           args['using_express'] = 'OFF'
         # default to packaging disabled
         # if simple:
         #    return 'cmake %(opts)s "%(dir)s"' % args
         return ('cmake -G "%(generator)s" '
+                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
                 '-DSTANDALONE:BOOL=%(standalone)s '
                 '-DUNATTENDED:BOOL=%(unattended)s '
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
-                #'-DPACKAGE:BOOL=ON '
+                '-DUSING_EXPRESS:BOOL=%(using_express)s '
+                '-DUSE_VSTOOL:BOOL=%(use_vstool)s '
+                '%(nmake)s '
                 '%(opts)s "%(dir)s"' % args)
 
-    def find_visual_studio(self, gen=None):
-        if gen is None:
-            gen = self._generator
-        gen = gen.lower()
-        try:
-            import _winreg
-            key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
-                       self.gens[gen]['ver'])
-            value_str = (r'EnvironmentDirectory')
-            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
-                   (key_str, value_str))
-            print key_str
-
-            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-            key = _winreg.OpenKey(reg, key_str)
-            value = _winreg.QueryValueEx(key, value_str)[0]
-            print 'Found: %s' % value
-            return value
-        except WindowsError, err:
-            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
-            return ''
-
-    def find_visual_studio_express(self, gen=None):
-        if gen is None:
-            gen = self._generator
-        gen = gen.lower()
-        try:
-            import _winreg
-            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
-                       self.gens[gen]['ver'])
-            value_str = (r'ProductDir')
-            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
-                   (key_str, value_str))
-            print key_str
-
-            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-            key = _winreg.OpenKey(reg, key_str)
-            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
-            print 'Found: %s' % value
-            self.using_express = True
-            return value
-        except WindowsError, err:
-            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
-            return ''
-
     def get_build_cmd(self):
         if self.incredibuild:
             config = self.build_type
             if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]:
                 config = '\"%s|Win32\"' % config
-
             return "buildconsole %s.sln /build %s" % (self.project_name, config)
-           
-        environment = self.find_visual_studio()
+
+        environment = self.find_visual_studio(self.generator)
         if environment == '':
-            environment = self.find_visual_studio_express()
-            if environment == '':
-                 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
-            else:
-                 print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
-                 build_dirs=self.build_dirs();
-                 print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
-                 print >> sys.stderr, "Set %s as startup project" % self.project_name
-                 print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
-                 exit(0)   
+            environment = self.find_visual_studio_express(self.generator)
+            if self.generator != 'nmake':
+                if environment == '':
+                    print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+                else:
+                    build_dirs=self.build_dirs();
+                    return("\"\"%s\\vcbuild\" /useenv %s.sln \"%s|win32\"\"" % (environment, self.project_name, self.build_type))
+
+        if self.generator == 'nmake':
+           # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/meta-impy-bin.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/meta-impy-bin.dir/flags.make')
+           # Evil hack.
+           self.run(r'touch newview/touched.bat')
+           return 'nmake'
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 
@@ -637,55 +657,29 @@ class WindowsSetup(PlatformSetup):
             raise CommandError('the command %r %s' %
                                (name, ret))
 
-    def run_cmake(self, args=[]):
-        '''Override to add the vstool.exe call after running cmake.'''
-        PlatformSetup.run_cmake(self, args)
-        if self.unattended == 'OFF':
-            if self.using_express == False:
-                self.run_vstool()
-
-    def run_vstool(self):
-        for build_dir in self.build_dirs():
-            stamp = os.path.join(build_dir, 'vstool.txt')
-            try:
-                prev_build = open(stamp).read().strip()
-            except IOError:
-                prev_build = ''
-            if prev_build == self.build_type:
-                # Only run vstool if the build type has changed.
-                continue
-            vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
-                          ' --solution ' +
-                          os.path.join(build_dir,'meta-impy.sln') +
-                          ' --config ' + self.build_type +
-                          ' --startup meta-impy-bin')
-            print 'Running %r in %r' % (vstool_cmd, getcwd())
-            self.run(vstool_cmd)        
-            print >> open(stamp, 'w'), self.build_type
-        
     def run_build(self, opts, targets):
         cwd = getcwd()
         build_cmd = self.get_build_cmd()
-
-        for d in self.build_dirs():
-            try:
-                os.chdir(d)
-                if targets:
-                    for t in targets:
-                        cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
+        if build_cmd != "":
+            for d in self.build_dirs():
+                try:
+                    os.chdir(d)
+                    if targets:
+                        for t in targets:
+                            cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
+                            print 'Running %r in %r' % (cmd, d)
+                            self.run(cmd)
+                    else:
+                        cmd = '%s %s' % (build_cmd, ' '.join(opts))
                         print 'Running %r in %r' % (cmd, d)
                         self.run(cmd)
-                else:
-                    cmd = '%s %s' % (build_cmd, ' '.join(opts))
-                    print 'Running %r in %r' % (cmd, d)
-                    self.run(cmd)
-            finally:
-                os.chdir(cwd)
-                
+                finally:
+                    os.chdir(cwd)
+
 class CygwinSetup(WindowsSetup):
     def __init__(self):
         super(CygwinSetup, self).__init__()
-        self.generator = 'vc80'
+        self.generator = 'nmake'
 
     def cmake_commandline(self, src_dir, build_dir, opts, simple):
         dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
@@ -695,11 +689,13 @@ class CygwinSetup(WindowsSetup):
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
-            project_name=self.project_name
+            project_name=self.project_name,
+            type=self.build_type
             )
         #if simple:
         #    return 'cmake %(opts)s "%(dir)s"' % args
         return ('cmake -G "%(generator)s" '
+                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
                 '-DUNATTENDED:BOOl=%(unattended)s '
                 '-DSTANDALONE:BOOL=%(standalone)s '
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
@@ -726,7 +722,7 @@ Options:
   -m32 | -m64           build architecture (32-bit or 64-bit)
   -N | --no-distcc      disable use of distcc
   -G | --generator=NAME generator name
-                        Windows: VC80 (VS2005--default), VC71 (VS2003), 
+                        Windows: NMake, VC80 (VS2005--default), VC71 (VS2003), 
                           VC90 (VS2008), or VC100 (VS2010)
                         Mac OS X: Xcode (default), Unix Makefiles
                         Linux: Unix Makefiles (default), KDevelop3
@@ -818,7 +814,6 @@ For example: develop.py configure -DSERVER:BOOL=OFF"""
             for d in setup.build_dirs():
                 if not os.path.exists(d):
                     raise CommandError('run "develop.py cmake" first')
-            setup.run_cmake()
             opts, targets = setup.parse_build_opts(args)
             setup.run_build(opts, targets)
         elif cmd == 'clean':
diff --git a/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h b/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h
index 39d58f5..6a18960 100755
--- a/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h
+++ b/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h
@@ -93,8 +93,10 @@
 #define WIN32_LEAN_AND_MEAN

 #include <windows.h>

 

-#define strcasecmp stricmp

-#define strncasecmp strnicmp

+#define strcasecmp _stricmp

+#define strncasecmp _strnicmp

 #define snprintf _snprintf

+//#define snprintf _snprintf_s

+//#define strerror strerror_s

 

 #endif

diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index e2be922..f648c5c 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
         }
 
         case LLSD::TypeUUID:
+        {
                 ostr.put('u');
-                ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
+                U8 *value = data.asUUID().mData;
+                ostr.write((const char*)(&value), UUID_BYTES);
                 break;
+        }
 
         case LLSD::TypeString:
                 ostr.put('s');
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 7729a5f..7c3dcbf 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -394,13 +394,15 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
                 if (status == XML_STATUS_ERROR)
                 {
                         std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser )));
-//                      if (input.gcount() == 0)
-//                      {
-//                              // nothing to do -- MC
-//                              data = LLSD();
-//                              return LLSDParser::PARSE_FAILURE;
-//                      }
-                        /*else*/ if (error_string != "parsing aborted") // end of input
+                        // I know, this if seems odd, but it fixes a problem with not being able to see nearby sims, or TP to other sims.
+                        // No idea why.
+                        if (input && (input.gcount() == 0))
+                        {
+                                // nothing to do -- MC
+                                data = LLSD();
+                                return LLSDParser::PARSE_FAILURE;
+                        }
+                        else if (error_string != "parsing aborted") // end of input
                         {
                                 S32 line_number = XML_GetCurrentLineNumber( mParser );
                                 // This parses LLCurl::Responder::completedRaw always, even
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 95aa7b5..fe0ab2a 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -596,6 +596,40 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
         return out;
 }
 
+bool is_hex_string(U8* str, S32 len)
+{
+        bool rv = true;
+        U8* c = str;
+        while(rv && len--)
+        {
+                switch(*c)
+                {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                case 'a':
+                case 'b':
+                case 'c':
+                case 'd':
+                case 'e':
+                case 'f':
+                        ++c;
+                        break;
+                default:
+                        rv = false;
+                        break;
+                }
+        }
+        return rv;
+}
+
 bool LLStringOps::isHexString(const std::string& str)
 {
         const char* buf = str.c_str();
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index ced9713..e1b5cbd 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -458,6 +458,8 @@ LL_COMMON_API std::string mbcsstring_makeASCII(const std::string& str);
 
 LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str);
 
+LL_COMMON_API bool is_hex_string(U8* str, S32 len);
+
 
 #if LL_WINDOWS
 /* @name Windows string helpers
diff --git a/linden/indra/llmath/llsdutil_math.cpp b/linden/indra/llmath/llsdutil_math.cpp
index 073cb2e..8ec8661 100644
--- a/linden/indra/llmath/llsdutil_math.cpp
+++ b/linden/indra/llmath/llsdutil_math.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -14,13 +14,13 @@
  * ("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
+ * online at http://secondlife.com/developers/opensource/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
+ * http://secondlife.com/developers/opensource/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -30,11 +30,12 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
+ * 
  */
 
 #include "linden_common.h"
 
-#include "llsdutil.h"
+#include "llsdutil_math.h"
 
 #include "v3math.h"
 #include "v4math.h"
@@ -165,9 +166,6 @@ LLSD ll_sd_from_color4(const LLColor4& c)
 LLColor4 ll_color4_from_sd(const LLSD& sd)
 {
         LLColor4 c;
-        c.mV[0] = (F32)sd[0].asReal();
-        c.mV[1] = (F32)sd[1].asReal();
-        c.mV[2] = (F32)sd[2].asReal();
-        c.mV[3] = (F32)sd[3].asReal();
+        c.setValue(sd);
         return c;
 }
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 618048c..9dc3746 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -4437,14 +4437,7 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
         const std::vector<LLVector3>& profile = volume->getProfile().mProfile;
         S32 max_s = volume->getProfile().getTotal();
         S32 max_t = volume->getPath().mPath.size();
-
-        // S32 i;
-        S32 num_vertices = 0, num_indices = 0;
-        S32     grid_size = (profile.size()-1)/4;
-        S32     quad_count = (grid_size * grid_size);
-
-        num_vertices = (grid_size+1)*(grid_size+1);
-        num_indices = quad_count * 4;
+        S32 grid_size = (profile.size() - 1) / 4;
 
         LLVector3& min = mExtents[0];
         LLVector3& max = mExtents[1];
diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index f24d103..3eebfad 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -73,13 +73,13 @@ U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
     unsigned char initial_vector[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
         EVP_EncryptInit_ex(&context, NULL, NULL, mSecret, initial_vector);
 
-    int blocksize = EVP_CIPHER_CTX_block_size(&context);
-    int keylen = EVP_CIPHER_CTX_key_length(&context);
-    int iv_length = EVP_CIPHER_CTX_iv_length(&context);
-    lldebugs << "LLBlowfishCipher blocksize " << blocksize
-                << " keylen " << keylen
-                << " iv_len " << iv_length
-                << llendl;
+//    int blocksize = EVP_CIPHER_CTX_block_size(&context);
+//    int keylen = EVP_CIPHER_CTX_key_length(&context);
+//    int iv_length = EVP_CIPHER_CTX_iv_length(&context);
+//    lldebugs << "LLBlowfishCipher blocksize " << blocksize
+//              << " keylen " << keylen
+//              << " iv_len " << iv_length
+//              << llendl;
 
         int output_len = 0;
         int temp_len = 0;
@@ -113,7 +113,59 @@ ERROR:
 // virtual
 U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
-        llerrs << "LLBlowfishCipher decrypt unsupported" << llendl;
+        if (!src || !src_len || !dst || !dst_len) return 0;
+        if (src_len > dst_len) return 0;
+
+        // OpenSSL uses "cipher contexts" to hold encryption parameters.
+    EVP_CIPHER_CTX context;
+    EVP_CIPHER_CTX_init(&context);
+
+        // We want a blowfish cyclic block chain cipher, but need to set 
+        // the key length before we pass in a key, so call EncryptInit 
+        // first with NULLs.
+        EVP_DecryptInit_ex(&context, EVP_bf_cbc(), NULL, NULL, NULL);
+        EVP_CIPHER_CTX_set_key_length(&context, (int)mSecretSize);
+        
+        // Complete initialization.  Per EVP_EncryptInit man page, the
+        // cipher pointer must be NULL.  Apparently initial_vector must
+        // be 8 bytes for blowfish, as this is the block size.
+    unsigned char initial_vector[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+        EVP_DecryptInit_ex(&context, NULL, NULL, mSecret, initial_vector);
+
+//    int blocksize = EVP_CIPHER_CTX_block_size(&context);
+//    int keylen = EVP_CIPHER_CTX_key_length(&context);
+//    int iv_length = EVP_CIPHER_CTX_iv_length(&context);
+//    lldebugs << "LLBlowfishCipher blocksize " << blocksize
+//              << " keylen " << keylen
+//              << " iv_len " << iv_length
+//              << llendl;
+
+        int output_len = 0;
+        int temp_len = 0;
+        if (!EVP_DecryptUpdate(&context,
+                        dst,
+                        &output_len,
+                        src,
+                        src_len))
+        {
+                llwarns << "LLBlowfishCipher::decrypt EVP_DecryptUpdate failure" << llendl;
+                goto ERROR;
+        }
+
+        // There may be some final data left to decrypt if the input is
+        // not an exact multiple of the block size.
+        if (!EVP_DecryptFinal_ex(&context, (unsigned char*)(dst + output_len), &temp_len))
+        {
+                llwarns << "LLBlowfishCipher::decrypt EVP_DecryptFinal failure" << llendl;
+                goto ERROR;
+        }
+        output_len += temp_len;
+
+        EVP_CIPHER_CTX_cleanup(&context);
+        return output_len;
+
+ERROR:
+        EVP_CIPHER_CTX_cleanup(&context);
         return 0;
 }
 
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 49dbdbd..fcdb354 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -743,7 +743,8 @@ LLAssetRequest* LLHTTPAssetStorage::findNextRequest(LLAssetStorage::request_list
         request_list_t::iterator running_end   = running.end();
 
         request_list_t::iterator pending_iter = pending.begin();
-        request_list_t::iterator pending_end  = pending.end();
+        // FIXME onefang - I assume this was being used to speed up the for(), but this is just a quick pass to get rid of warnings.  Try to understand it later.
+        //request_list_t::iterator pending_end  = pending.end();
         // Loop over all pending requests until we miss finding it in the running list.
         for (; pending_iter != pending.end(); ++pending_iter)
         {
diff --git a/linden/indra/llplugin/slplugin/CMakeLists.txt b/linden/indra/llplugin/slplugin/CMakeLists.txt
index 81d9299..f794dae 100755
--- a/linden/indra/llplugin/slplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/slplugin/CMakeLists.txt
@@ -75,7 +75,7 @@ if (DARWIN)
     COMMAND mkdir
     ARGS
       -p
-      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
+      ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/SLPlugin.app/Contents/Resources
   )
 endif (DARWIN)
 
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp
index 7dd764e..f06bfe8 100755
--- a/linden/indra/llprimitive/llmaterialtable.cpp
+++ b/linden/indra/llprimitive/llmaterialtable.cpp
@@ -40,16 +40,6 @@
 
 LLMaterialTable LLMaterialTable::basic(1);
 
-// Material UUIDs.
-LLUUID const LL_DEFAULT_STONE_UUID("87c5765b-aa26-43eb-b8c6-c09a1ca6208e");
-LLUUID const LL_DEFAULT_METAL_UUID("6f3c53e9-ba60-4010-8f3e-30f51a762476");
-LLUUID const LL_DEFAULT_GLASS_UUID("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");
-LLUUID const LL_DEFAULT_WOOD_UUID("89556747-24cb-43ed-920b-47caed15465f");
-LLUUID const LL_DEFAULT_FLESH_UUID("80736669-e4b9-450e-8890-d5169f988a50");
-LLUUID const LL_DEFAULT_PLASTIC_UUID("304fcb4e-7d33-4339-ba80-76d3d22dc11a");
-LLUUID const LL_DEFAULT_RUBBER_UUID("9fae0bc5-666d-477e-9f70-84e8556ec867");
-LLUUID const LL_DEFAULT_LIGHT_UUID("00000000-0000-0000-0000-000000000000");
-
 /* 
         Old Havok 1 constants
 
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 2ca1984..965e2d9 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -535,6 +535,8 @@ void LLFont::renderGlyph(const U32 glyph_index) const
         int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT );
         llassert(!error);
 
+        // Work around the compiler warning about error not being used when llassert() is compiled out.
+        error = error + 0;
         error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode);
 
         mRenderGlyphCount++;
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 4a4ff1b..b57a562 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -383,11 +383,10 @@ bool LLGLManager::initGL()
         if (mGLVendor.substr(0,4) == "ATI ")
         {
                 mGLVendorShort = "ATI";
-                BOOL mobile = FALSE;
-                if (mGLRenderer.find("MOBILITY") != std::string::npos)
-                {
-                        mobile = TRUE;
-                }
+                // This is not used anywhere.
+                //BOOL mobile = FALSE;
+                //if (mGLRenderer.find("MOBILITY") != std::string::npos)
+                //      mobile = TRUE;
                 mIsATI = TRUE;
 
 #if LL_WINDOWS && !LL_MESA_HEADLESS
@@ -1014,8 +1013,8 @@ void assert_glerror()
 void clear_glerror()
 {
         //  Create or update texture to be used with this data 
-        GLenum error;
-        error = glGetError();
+        //GLenum error;
+        /*error =*/ glGetError();
 }
 
 ///////////////////////////////////////////////////////////////
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index c63d7ad..f99d4a9 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -711,7 +711,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
                                         {
                                                 S32 bytes = w * h * mComponents;
                                                 llassert(prev_mip_data);
-                                                llassert(prev_mip_size == bytes*4);
+                                                llassert(prev_mip_size == (bytes*4));
+                                                // Work around llassert() being compiled out and prev_mip_size not otherwise being used.
+                                                prev_mip_size = prev_mip_size + 0;
                                                 U8* new_data = new U8[bytes];
                                                 llassert_always(new_data);
                                                 LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents);
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 2546c4e..e79f7b2 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -75,7 +75,8 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mListPosition(BELOW),
         mPrearrangeCallback( NULL ),
         mTextEntryCallback( NULL ),
-        mLabel(label)
+        mLabel(label),
+        mListColor(LLUI::sColorsGroup->getColor("ComboBoxBg"))
 {
         if (font)
         {
@@ -109,7 +110,7 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), mGLFont,
                                                                  &LLComboBox::onItemSelected, this, FALSE);
         mList->setVisible(FALSE);
-        mList->setBgWriteableColor( LLColor4(1,1,1,1) );
+        mList->setBgWriteableColor(mListColor);
         mList->setCommitOnKeyboardMovement(FALSE);
         addChild(mList);
 
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 7384b87..0ce6ccd 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -187,12 +187,13 @@ public:
         virtual void    hideList();
 
 protected:
-        LLButton*                       mButton;
+        LLButton*               mButton;
         LLScrollListCtrl*       mList;
         EPreferredPosition      mListPosition;
         LLPointer<LLUIImage>    mArrowImage;
-        std::string                     mLabel;
+        std::string             mLabel;
         const LLFontGL*         mGLFont;
+        LLColor4                mListColor;
 
 private:
         S32                                     mButtonPadding;
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 58c717a..4c4aeaf 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -277,30 +277,14 @@ void LLFloater::initFloater(const std::string& title,
         mMinimized = FALSE;
         mExpandedRect.set(0,0,0,0);
         
-        S32 close_pad;                  // space to the right of close box
         S32 close_box_size;             // For layout purposes, how big is the close box?
         if (close_btn)
         {
                 close_box_size = LLFLOATER_CLOSE_BOX_SIZE;
-                close_pad = 0;
         }
         else
         {
                 close_box_size = 0;
-                close_pad = 0;
-        }
-
-        S32 minimize_box_size;
-        S32 minimize_pad;
-        if (minimizable && !drag_on_left)
-        {
-                minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE;
-                minimize_pad = 0;
-        }
-        else
-        {
-                minimize_box_size = 0;
-                minimize_pad = 0;
         }
 
         // Drag Handle
diff --git a/linden/indra/llui/llfunctorregistry.h b/linden/indra/llui/llfunctorregistry.h
index 8864f7a..7c03f2f 100644
--- a/linden/indra/llui/llfunctorregistry.h
+++ b/linden/indra/llui/llfunctorregistry.h
@@ -75,7 +75,6 @@ public:
         bool registerFunctor(const std::string& name, ResponseFunctor f)
         {
                 bool retval = true;
-                typename FunctorMap::iterator it = mMap.find(name);
                 if (mMap.count(name) == 0)
                 {
                         mMap[name] = f;
@@ -102,7 +101,6 @@ public:
 
         FUNCTOR_TYPE getFunctor(const std::string& name)
         {
-                typename FunctorMap::iterator it = mMap.find(name);
                 if (mMap.count(name) != 0)
                 {
                         return mMap[name];
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 93da44c..a50dbff 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -288,7 +288,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 
         const llwchar* base = wtext.c_str();
         const llwchar* cur = base;
-        const llwchar* line = NULL;
 
         while( *cur )
         {
@@ -304,7 +303,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                         }
 
                         // Start of a new line
-                        line = cur;
 
                         // Skip white space
                         while( *cur && isspace(*cur) && (*cur != '\n')  )
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 2d4a2f1..6850891 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3095,8 +3095,6 @@ void LLMenuGL::draw( void )
                         LLUI::sConfigGroup->getS32("DropShadowFloater") );
         }
 
-        LLColor4 bg_color = mBackgroundColor;
-
         if( mBgVisible )
         {
                 gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),    0, mBackgroundColor );
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 07e78ed..361e4f3 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -1078,7 +1078,6 @@ struct LLLayoutStack::LLEmbeddedPanel
                         mVisibleAmt(1.f) // default to fully visible
         {
                 LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM;
-                LLRect resize_bar_rect = panelp->getRect();
 
                 S32 min_dim;
                 if (orientation == HORIZONTAL)
diff --git a/linden/indra/llui/llprogressbar.cpp b/linden/indra/llui/llprogressbar.cpp
index d148733..0000d77 100644
--- a/linden/indra/llui/llprogressbar.cpp
+++ b/linden/indra/llui/llprogressbar.cpp
@@ -83,9 +83,6 @@ void LLProgressBar::draw()
         bar_bg_imagep->draw(getLocalRect(),
                 background_color);
 
-        F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
-        LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor");
-        bar_color.mV[3] = alpha;
         LLRect progress_rect = getLocalRect();
         progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
         bar_fg_imagep->draw(progress_rect);
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 22610ca..a16cfdf 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -266,8 +266,13 @@ std::string LLResMgr::getMonetaryString( S32 input ) const
                         default:                        // Unknown -- use the US defaults.
                         case LLLOCALE_USA: 
                         case LLLOCALE_UK:       // UK ends up being the same as US for the items used here.
-                                fakeconv.negative_sign = "-";
-                                fakeconv.mon_grouping = "\x03\x03\x00"; // commas every 3 digits
+                                                // Mac OS X 10.6 SDK's struct lconv contains "char *" not
+                                                // "const char *" so these char arrays work around the error
+                                                // this causes in GCC 4.2, even though they won't be modified.
+                                static char negative_sign[] = "-";
+                                static char mon_grouping[] = "\x03\x03\x00";
+                                fakeconv.negative_sign = negative_sign;
+                                fakeconv.mon_grouping = mon_grouping;  // commas every 3 digits
                                 fakeconv.n_sign_posn = 1; // negative sign before the string
                         break;
                 }
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 5c17baa..c8f5935 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -283,7 +283,6 @@ void LLSlider::draw()
 
         F32 opacity = getEnabled() ? 1.f : 0.3f;
         LLColor4 center_color = (mThumbCenterColor % opacity);
-        LLColor4 track_color = (mTrackColor % opacity);
 
         // Track
         LLRect track_rect(mThumbImage->getWidth() / 2, 
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 8612427..106f658 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3077,7 +3077,6 @@ void LLTextEditor::drawSelectionBackground()
                 S32 selection_right_x   = mTextRect.mRight;
                 S32 selection_right_y   = mTextRect.mBottom;
 
-                BOOL selection_left_visible = FALSE;
                 BOOL selection_right_visible = FALSE;
 
                 // Skip through the lines we aren't drawing.
@@ -3085,7 +3084,6 @@ void LLTextEditor::drawSelectionBackground()
 
                 S32 left_line_num = cur_line;
                 S32 num_lines = getLineCount();
-                S32 right_line_num = num_lines - 1;
 
                 S32 line_start = -1;
                 if (cur_line >= num_lines)
@@ -3119,13 +3117,11 @@ void LLTextEditor::drawSelectionBackground()
                         if( line_start <= selection_left && selection_left <= line_end )
                         {
                                 left_line_num = cur_line;
-                                selection_left_visible = TRUE;
                                 selection_left_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_left - line_start, mAllowEmbeddedItems);
                                 selection_left_y = text_y;
                         }
                         if( line_start <= selection_right && selection_right <= line_end )
                         {
-                                right_line_num = cur_line;
                                 selection_right_visible = TRUE;
                                 selection_right_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_right - line_start, mAllowEmbeddedItems);
                                 if (selection_right == line_end)
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index ebcc730..466d2c7 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -706,10 +706,12 @@ public:
 
         // this avoids a MSVC bug where non-referenced static members are "optimized" away
         // even if their constructors have side effects
+        // Then we avoid a compiler warning that dummy is never used.  lol
         void reference()
         {
                 S32 dummy;
                 dummy = 0;
+                dummy = dummy + 0;
         }
 };
 
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
index 5b149c9..ce2865b 100644
--- a/linden/indra/llwindow/GL/glh_extensions.h
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -111,7 +111,9 @@ static const char* EatNonWhiteSpace(const char *str)
 int glh_init_extensions(const char *origReqExts)
 {
         // Length of requested extensions string
+        /*
         unsigned reqExtsLen;
+        */
         char *reqExts;
         // Ptr for individual extensions within reqExts
         char *reqExt;
@@ -153,8 +155,8 @@ int glh_init_extensions(const char *origReqExts)
                 return TRUE;
         }
         reqExts = strdup(origReqExts);
-        reqExtsLen = (S32)strlen(reqExts);
         /*
+        reqExtsLen = (S32)strlen(reqExts);
         if (NULL == gGLHExts.mUnsupportedExts)
         {
                 gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1);
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 58090b3..6717f7b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2518,9 +2518,10 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
         sortpat = FcNameParse((FcChar8*) sort_order.c_str());
         if (sortpat)
         {
+                FcResult dummyResult;
                 // Sort the list of system fonts from most-to-least-desirable.
                 fs = FcFontSort(NULL, sortpat, elide_unicode_coverage,
-                                NULL, NULL);
+                                NULL, &dummyResult);
                 FcPatternDestroy(sortpat);
         }
 
diff --git a/linden/indra/lscript/lscript_compile/CMakeLists.txt b/linden/indra/lscript/lscript_compile/CMakeLists.txt
index 252085b..f6d5212 100644
--- a/linden/indra/lscript/lscript_compile/CMakeLists.txt
+++ b/linden/indra/lscript/lscript_compile/CMakeLists.txt
@@ -103,7 +103,7 @@ if (WINDOWS)
                               PROPERTIES COMPILE_FLAGS /DYY_NO_UNISTD_H)
 endif (WINDOWS)
 
-if (WINDOWS)
+if (WINDOWS AND NOT CYGWIN)
   get_filename_component(M4_PATH ${M4} PATH)
   add_custom_command(
       OUTPUT
@@ -118,7 +118,7 @@ if (WINDOWS)
         ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
       )
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
-else (WINDOWS)
+else (WINDOWS AND NOT CYGWIN)
   add_custom_command(
       OUTPUT
         ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
@@ -131,7 +131,7 @@ else (WINDOWS)
       DEPENDS
         ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
       )
-endif (WINDOWS)
+endif (WINDOWS AND NOT CYGWIN)
 
 if (DARWIN)
   # Mac OS X 10.4 compatibility
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 584087e..7f4cdc5 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -53,9 +53,16 @@ void parse_string();
 #define ECHO do { } while (0)
 
 #if defined(__cplusplus)
-extern "C" { int yylex( void ); }
-extern "C" { int yyparse( void ); }
-extern "C" { int yyerror(const char *fmt, ...); }
+extern "C" {
+#endif
+int yyerror(const char *fmt, ...);
+int yylex( void );
+// Windows defines this in indra.y.hpp, which is included above, and defines it differently.
+#ifndef LL_WINDOWS
+int yyparse( void );
+#endif
+#if defined(__cplusplus)
+}
 #endif
 
 %}
@@ -722,9 +729,6 @@ L?\"(\\.|[^\\"])*\"	{ parse_string(); count(); return(STRING_CONSTANT); }
 LLScriptAllocationManager       *gAllocationManager;
 LLScriptScript                          *gScriptp;
 
-// Prototype for the yacc parser entry point
-int yyparse(void);
-
 int yyerror(const char *fmt, ...)
 {
         gErrorToText.writeError(yyout, gLine, gColumn, LSERROR_SYNTAX_ERROR);
@@ -760,7 +764,13 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
 
             yyrestart(yyin);
 
-                b_parse_ok = !yyparse();
+// TODO - Try to fix this, but for now, no compiling LSL for Windows in SL.
+// Actually, this seems to not actually be needed anymore?
+// I thought it was needed to support ancient pre Mono LSL scripts, which only work in SL anyway, but they still work fine.  Perhaps SL fixed it server side?
+// If that's the case, we don't need any of this stuff.
+#ifndef LL_WINDOWS
+//              b_parse_ok = !yyparse();
+#endif
 
                 if (b_parse_ok)
                 {
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
index cb9a78e..7da5e51 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -809,16 +809,7 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id,
         //  is there a fault?
         //      if yes, print out message and exit
         S32 value = getVersion();
-        S32 major_version = 0;
-        if (value == LSL2_VERSION1_END_NUMBER)
-        {
-                major_version = 1;
-        }
-        else if (value == LSL2_VERSION_NUMBER)
-        {
-                major_version = 2;
-        }
-        else
+        if ((value != LSL2_VERSION1_END_NUMBER) && (value != LSL2_VERSION_NUMBER))
         {
                 setFault(LSRF_VERSION_MISMATCH);
         }
diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
index 3b10cc6..05eb826 100644
--- a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -150,7 +150,9 @@ void LLScriptLSOParse::printGlobals(LLFILE *fp)
 
                 // get offset to skip past name
                 varoffset = global_v_offset;
+                // FIXME: Not actually used, perhaps there's a skip function?  Or perhaps we really do need to skip past a name as the above comment suggests?
                 offset = bytestream2integer(mRawData, global_v_offset);
+                offset = offset + 0;
                 
                 // get typeexport
                 type = *(mRawData + global_v_offset++);
@@ -268,8 +270,6 @@ void LLScriptLSOParse::printGlobalFunctions(LLFILE *fp)
                 fprintf(fp, "[Function #%d] [0x%X] %s\n", function_number, orig_function_offset, name);
                 fprintf(fp, "\tReturn Type: %s\n", LSCRIPTTypeNames[type]);
                 type = *(mRawData + function_offset++);
-                S32 params;
-                params = 0;
                 S32 pcount = 0;
                 while (type)
                 {
@@ -362,7 +362,9 @@ void LLScriptLSOParse::printStates(LLFILE *fp)
                                         if (event_handlers & LSCRIPTStateBitField[k])
                                         {
                                                 temp_end = bytestream2integer(mRawData, read_ahead);
+                                                // FIXME onefang: Dummy is not actually used, but perhaps this is here to stop a warning?  We need to stop another warning now.  Some sort of skip might be better.
                                                 dummy = bytestream2integer(mRawData, read_ahead);
+                                                dummy = dummy + 0;
                                                 if (  (temp_end < opcode_end)
                                                         &&(temp_end > event_offset))
                                                 {
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index a623a9a..c592c8b 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
  * @file lscript_library.cpp
  * @brief external library interface
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
+ *
  * Copyright (c) 2002-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
@@ -13,17 +13,17 @@
  * ("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.
@@ -37,7 +37,7 @@
 //  ##  ##  ## ##     ## ########  ## ## ##  ##  ## ## ## ##   ####  ##   ##
 //  ##  ##  ## ######### ##   ##   ##  ####  ##  ##  #### ##    ##
 //  ##  ##  ## ##     ## ##    ##  ##   ###  ##  ##   ### ##    ##  #### ####
-//   ###  ###  ##     ## ##     ## ##    ## #### ##    ##  ######   #### #### 
+//   ###  ###  ##     ## ##     ## ##    ## #### ##    ##  ######   #### ####
 //
 // When adding functions, they <b>MUST</b> be appended to the end of
 // the init() method. The init() associates the name with a number,
@@ -335,7 +335,7 @@ void LLScriptLibrary::init()
 
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetRemoteScriptAccessPin", NULL, "i", "llSetRemoteScriptAccessPin(integer pin)\nIf pin is set to a non-zero number, the task will accept remote script\nloads via llRemoteLoadScriptPin if it passes in the correct pin.\nOthersise, llRemoteLoadScriptPin is ignored."));
         addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llRemoteLoadScriptPin", NULL, "ksiii", "llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)\nIf the owner of the object this script is attached can modify target,\nthey are in the same region,\nand the matching pin is used,\ncopy script name onto target,\nif running == TRUE, start the script with param."));
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llOpenRemoteDataChannel", NULL, NULL, "llOpenRemoteDataChannel()\nCreates a channel to listen for XML-RPC calls.  Will trigger a remote_data event with channel id once it is available."));
         addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llSendRemoteData", "k", "ksis", "key llSendRemoteData(key channel, string dest, integer idata, string sdata)\nSend an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.\nA message identifier key is returned.\nAn XML-RPC reply will trigger a remote_data event and reference the message id.\nThe message_id is returned."));
         addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llRemoteDataReply", NULL, "kksi", "llRemoteDataReply(key channel, key message_id, string sdata, integer idata)\nSend an XML-RPC reply to message_id on channel with payload of string sdata and integer idata"));
@@ -351,7 +351,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llLog", "f", "f", "float llLog(float val)\nReturns the base e log of val if val > 0, otherwise returns 0."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetAnimationList", "l", "k", "list llGetAnimationList(key id)\nGets a list of all playing animations for avatar id"));
         addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llSetParcelMusicURL", NULL, "s", "llSetParcelMusicURL(string url)\nSets the streaming audio URL for the parcel object is on"));
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRootPosition", "v", NULL, "vector llGetRootPosition()\nGets the global position of the root object of the object script is attached to"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRootRotation", "q", NULL, "rotation llGetRootRotation()\nGets the global rotation of the root object of the object script is attached to"));
 
@@ -370,7 +370,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.0f, dummy_func, "llBase64ToInteger", "i", "s", "integer llBase64ToInteger(string str)\nBig endian decode of a Base64 string into an integer."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetGMTclock", "f", "", "float llGetGMTclock()\nGets the time in seconds since midnight in GMT"));
         addFunction(new LLScriptLibraryFunction(10.f, 10.f, dummy_func, "llGetSimulatorHostname", "s", "", "string llGetSimulatorHostname()\nGets the hostname of the machine script is running on (same as string in viewer Help dialog)"));
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLocalRot", NULL, "q", "llSetLocalRot(rotation rot)\nsets the rotation of a child prim relative to the root prim"));
 
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llParseStringKeepNulls", "l", "sll", "list llParseStringKeepNulls(string src, list separators, list spacers)\nBreaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each), keeping any null values generated."));
@@ -393,12 +393,12 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llParcelMediaQuery", "l", "l", "list llParcelMediaQuery(list query)\nSends a list of queries, returns a list of results."));
 
         addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llModPow", "i", "iii", "integer llModPow(integer a, integer b, integer c)\nReturns a raised to the b power, mod c. ( (a**b)%c ).  b is capped at 0xFFFF (16 bits)."));
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetInventoryType", "i", "s", "integer llGetInventoryType(string name)\nReturns the type of the inventory name"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetPayPrice", NULL, "il", "llSetPayPrice(integer price, list quick_pay_buttons)\nSets the default amount when someone chooses to pay this object."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraPos", "v", "", "vector llGetCameraPos()\nGets current camera position for agent task has permissions for."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraRot", "q", "", "rotation llGetCameraRot()\nGets current camera orientation for agent task has permissions for."));
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llSetPrimURL", NULL, "s", "llSetPrimURL(string url)\nUpdates the URL for the web page shown on the sides of the object."));
         addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llRefreshPrimURL", NULL, "", "llRefreshPrimURL()\nReloads the web page shown on the sides of the object."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llEscapeURL", "s", "s", "string llEscapeURL(string url)\nReturns and escaped/encoded version of url, replacing spaces with %20 etc."));
@@ -411,7 +411,7 @@ void LLScriptLibrary::init()
 
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCameraParams",                      NULL, "l", "llSetCameraParams(list rules)\nSets multiple camera parameters at once.\nList format is [ rule1, data1, rule2, data2 . . . rulen, datan ]"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llClearCameraParams",            NULL, NULL, "llClearCameraParams()\nResets all camera parameters to default values and turns off scripted camera control."));
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llListStatistics", "f", "il", "float llListStatistics(integer operation, list l)\nPerform statistical aggregate functions on list l using LIST_STAT_* operations."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetUnixTime", "i", NULL, "integer llGetUnixTime()\nGet the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelFlags", "i", "v", "integer llGetParcelFlags(vector pos)\nGet the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos."));
@@ -433,7 +433,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkPrimitiveParams", NULL, "il", "llSetLinkPrimitiveParams(integer linknumber, list rules)\nSet primitive parameters for linknumber based on rules."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkTexture", NULL, "isi", "llSetLinkTexture(integer link_pos, string texture, integer face)\nSets the texture of face for link_pos"));
 
-        
+
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is", "llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR."));
@@ -484,25 +484,25 @@ void LLScriptLibrary::init()
         // documented and therefore the description may be incomplete and require further attention.
         // OpenSimulator is written in C# and not CPP therefore some values for example "double = float" etc. are different.
 
-        // OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010 
-        // based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142 
-        // Updates by WhiteStar Magic 
+        // OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010
+        // based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142
+        // Updates by WhiteStar Magic
 
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif", "osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)\nChanges the Estate Sun Settings, then Triggers a Sun Update\n'sunFixed' TRUE (1) to keep the sun stationary, FALSE (0) to use global time\n'sunHour' The \"Sun Hour\" that is desired, 0...24, with 0 just after SunRise.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetEstateSunSettings", NULL, "if", "osSetEstateSunSettings(integer sunFixed, float sunHour)\nsunFixed = 0 or 1, sunHour = 00.00 to 24.00.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetCurrentSunHour", "f", NULL, "float osGetCurrentSunHour()\nReturns Float Value of Current Sun Hour 0...24 0 = sunrise.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunGetParam","f", "s", "float osSunGetParam(string param)\nReturns current float values for param\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunSetParam", "sf", NULL, "osSunSetParam(string param, float value)\nSet's Sun Param for SunSet,\nosSunSetParam(day_length, 24.0)\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindActiveModelPluginName", "s", NULL, "string osWindActiveModelPluginName()\nReturns the Current Working Wind Module Installed\nThese are SimpleRandomWind or ConfigurableWind, optionally others.\n(OpenSim only.)"));
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));   
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));    
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));      
-        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)")); 
-        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)")); 
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));
+        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)"));
+        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osList2Double", "f", "si", "double osList2Double(list src, int index)\nReturns Double (float) Value from src at index.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURL", NULL, "ssssi", "osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer )\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));     
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlend", NULL, "ssssii", "osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, int timer, int alpha)\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureDataBlend", NULL, "ssssii", "osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, int timer, int alpha)\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlendFace", NULL, "ssssfiiii", "osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, bool blend, int disp, int timer, int alpha, int face)\nLoads a web texture on a prim.\n(OpenSim only.)"));
@@ -512,7 +512,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osTerrainFlush", NULL, NULL, "osTerrainFlush()\nUpdates terrain data. Call this after you are done using osTerrainSetHeight.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osRegionRestart", NULL, "f", "int osRegionRestart(double seconds)\nRestart the current region in the specified number of seconds from now.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osRegionNotice",NULL, "s", "osRegionNotice(string msg)\nBroadcasts a notification message to all agents on the current region.\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s", "osConsoleCommand(string command)\nIssues commands directly to the OpenSim server console.\n(OpenSim only.)"));   
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s", "osConsoleCommand(string command)\nIssues commands directly to the OpenSim server console.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetParcelMediaURL", NULL, "s", "osSetParcelMediaURL(string url)\nSets Parcel Media URL.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetParcelSIPAddress", NULL, "s", "osSetParcelSIPAddress(string SIPAddress)\nSets Parcel SIP Address for Voice.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimFloatOnWater", NULL, "i", "osSetPrimFloatOnWater(int floatYN)\nMake Physical prims float at the water level, TRUE or FALSE.\n(OpenSim only.)"));
@@ -568,10 +568,10 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetSpeed", NULL, "kf", "osSetSpeed(key AVATAR, float SpeedModifier)\nMultiplies the normal running, walking, and flying speed of the specified avatar.\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseDamage", NULL, "kf", "osCauseDamage(key AVATAR, float damage)\nCauses damage to specified AVATAR (UUID).\n(OpenSim only.)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseHealing", NULL, "kf", "osCauseHealing(key AVATAR, float healing)\nCauses Healing to specified AVATAR (UUID).\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)")); 
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)")); 
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)")); 
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)"));
 
         // LightShare functions
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
@@ -579,6 +579,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmGetWindlightScene", "l", "l", "list cmGetWindlightScene(list rules)\nGet the current WindLight settings."));
         // LightShare functions - alternate versions
         // don't ask me why they renamed 'em, but we need to include both versions -- MC
+        // cm refers to a proprietary fork of OpenSim used by Meta 7 and Avination, they where renamed to ls when LightShare was released to the wild.
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsSetWindlightScene", "i", "l", "integer lsSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsSetWindlightSceneTargeted", "i", "lk", "integer lsSetWindlightSceneTargeted(list rules, key target)\nSet the current WindLight scene directed to a specific avatar. Restricted to estate managers and owners only."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsGetWindlightScene", "l", "l", "list lsGetWindlightScene(list rules)\nGet the current WindLight settings."));
diff --git a/linden/indra/mac_crash_logger/CMakeLists.txt b/linden/indra/mac_crash_logger/CMakeLists.txt
index daf3e10..ee1dc93 100644
--- a/linden/indra/mac_crash_logger/CMakeLists.txt
+++ b/linden/indra/mac_crash_logger/CMakeLists.txt
@@ -71,6 +71,6 @@ add_custom_command(
     -E
     copy_directory
     ${CMAKE_CURRENT_SOURCE_DIR}/CrashReporter.nib
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
   )
 
diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
index 0eac76f..5ae7dd8 100644
--- a/linden/indra/mac_updater/CMakeLists.txt
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -74,6 +74,6 @@ add_custom_command(
     -E
     copy_directory
     ${CMAKE_CURRENT_SOURCE_DIR}/AutoUpdater.nib
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
   )
 
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 43d9955..79783d3 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -68,8 +68,8 @@ EventHandlerRef gEventHandler = NULL;
 OSStatus gFailure = noErr;
 Boolean gCancelled = false;
 
-char *gUpdateURL;
-char *gProductName;
+const char *gUpdateURL;
+const char *gProductName;
 
 void *updatethreadproc(void*);
 
@@ -1032,7 +1032,7 @@ void *updatethreadproc(void*)
                 if(!mountOutput.empty())
                 {
                         const char *s = mountOutput.c_str();
-                        char *prefix = "/dev/";
+                        const char *prefix = "/dev/";
                         char *sub = strstr(s, prefix);
                         
                         if(sub != NULL)
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index e194bf7..49bf6f9 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -312,12 +312,9 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
 static gboolean
 gst_slvideo_start (GstBaseSink * bsink)
 {
-        GstSLVideo *slvideo;
-        gboolean ret = TRUE;
-        
-        slvideo = GST_SLVIDEO(bsink);
+        GST_SLVIDEO(bsink);
 
-        return ret;
+        return TRUE;
 }
 
 static gboolean
diff --git a/linden/indra/media_plugins/webkit/CMakeLists.txt b/linden/indra/media_plugins/webkit/CMakeLists.txt
index 303a774..f589c61 100644
--- a/linden/indra/media_plugins/webkit/CMakeLists.txt
+++ b/linden/indra/media_plugins/webkit/CMakeLists.txt
@@ -112,8 +112,8 @@ if (DARWIN)
   # copy the webkit dylib to the build directory
   add_custom_command(
     TARGET media_plugin_webkit POST_BUILD
-#    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+#    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/libllqtwebkit.dylib
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
     DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
     )
     
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index ecbeb9b..7496546 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -126,7 +126,7 @@ set(viewer_SOURCE_FILES
     jcfloaterareasearch.cpp
     kokuastreamingaudio.cpp
     kowopenregionsettings.cpp
-    lightshare.cpp
+    llettherebelight.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentdata.cpp
@@ -308,6 +308,7 @@ set(viewer_SOURCE_FILES
     llmaniprotate.cpp
     llmanipscale.cpp
     llmaniptranslate.cpp
+        llmediadataclient.cpp
     llmapresponders.cpp
     llmediaremotectrl.cpp
     llmemoryview.cpp
@@ -537,16 +538,15 @@ set(viewer_SOURCE_FILES
     slfloatermediafilter.cpp
     viewerinfo.cpp
     viewertime.cpp
-    windlightsettingsupdate.cpp
     wlfloatermanager.cpp
     wlfloaterwindlightsend.cpp
     wlretrievesettings.cpp
-    wlsettingsmanager.cpp
 # [/$PLOTR$]
     otr_wrapper.cpp
     otr_floater_smp_dialog.cpp
     otr_floater_smp_progress.cpp
 # [/$PLOTR$]
+    rcmoapradar.cpp
     )
 
 set(VIEWER_BINARY_NAME "meta-impy-bin" CACHE STRING
@@ -570,7 +570,7 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
     aoremotectrl.h
-        chatbar_as_cmdline.h
+    chatbar_as_cmdline.h
     emeraldboobutils.h
     floaterao.h
     floaterbusy.h
@@ -590,11 +590,11 @@ set(viewer_HEADER_FILES
     jcfloater_animation_list.h
     jcfloaterareasearch.h
     kokuastreamingaudio.h
-    lightshare.h
-        lggautocorrectfloater.h
-        lggautocorrect.h
-        lggdicdownload.h
-        lgghunspell_wrapper.h
+    llettherebelight.h
+    lggautocorrectfloater.h
+    lggautocorrect.h
+    lggdicdownload.h
+    lgghunspell_wrapper.h
     llagent.h
     llagentaccess.h
     llagentdata.h
@@ -777,6 +777,7 @@ set(viewer_HEADER_FILES
     llmaniprotate.h
     llmanipscale.h
     llmaniptranslate.h
+    llmediadataclient.h
     llmapresponders.h
     llmediaremotectrl.h
     llmemoryview.h
@@ -1020,12 +1021,12 @@ set(viewer_HEADER_FILES
     wlfloatermanager.h
     wlfloaterwindlightsend.h
     wlretrievesettings.h
-    wlsettingsmanager.h
 # [$PLOTR$]
     otr_wrapper.h
     otr_floater_smp_dialog.h
     otr_floater_smp_progress.h
 # [/$PLOTR$]
+    rcmoapradar.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
@@ -1373,7 +1374,7 @@ if (WINDOWS)
 
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
-                if (NOT self.using_express)
+                if (USE_VSTOOL)
                         add_custom_command(
                                 TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
                                 COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
@@ -1385,7 +1386,7 @@ if (WINDOWS)
                                   ${CMAKE_CURRENT_SOURCE_DIR}
                                 COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
                                 )
-                endif (NOT self.using_express)
+                endif (USE_VSTOOL)
     endif (NOT UNATTENDED)
 
     add_custom_command(
@@ -1395,7 +1396,7 @@ if (WINDOWS)
           -E
           copy_if_different
           ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/messages/message_template.msg
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message_template.msg
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings/message_template.msg
         COMMENT "Copying message_template.msg to the runtime folder."
         )
 
@@ -1406,7 +1407,7 @@ if (WINDOWS)
           -E
           copy_if_different
           ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message.xml
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings/message.xml
         COMMENT "Copying message.xml to the runtime folder."
         )
        
@@ -1417,11 +1418,11 @@ if (WINDOWS)
     endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
         
     add_custom_command(
-        OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
+        OUTPUT ${VIEWER_CFG_INTDIR}/touched.bat
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-          --configuration=${CMAKE_CFG_INTDIR}
+          --configuration=${VIEWER_CFG_INTDIR}
           --channel=${VIEWER_CHANNEL}
           --login_channel=${VIEWER_LOGIN_CHANNEL}
           --standalone=${STANDALONE}
@@ -1430,15 +1431,15 @@ if (WINDOWS)
           --source=${CMAKE_CURRENT_SOURCE_DIR}
               --artwork=${ARTWORK_DIR}
               --build=${CMAKE_CURRENT_BINARY_DIR}
-              --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/package
-              --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
+              --dest=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/package
+              --touch=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/touched.bat
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
 
     add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
 
     if (PACKAGE)
-      add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
+      add_custom_target(package ALL DEPENDS ${VIEWER_CFG_INTDIR}/touched.bat)
       add_dependencies(package windows-updater windows-crash-logger)
     endif (PACKAGE)
 endif (WINDOWS)
@@ -1590,8 +1591,8 @@ if (DARWIN)
       --artwork=${ARTWORK_DIR}
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --buildtype=${CMAKE_BUILD_TYPE}
-      --configuration=${CMAKE_CFG_INTDIR}
-      --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+      --configuration=${VIEWER_CFG_INTDIR}
+      --dest=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/${product}.app
       --grid=${GRID}
       --source=${CMAKE_CURRENT_SOURCE_DIR}
       --standalone=${STANDALONE}
@@ -1622,8 +1623,8 @@ if (WINDOWS)
       -E
       copy_if_different
       ${BUILT_LLCOMMON}
-      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      COMMENT "Copying llcommon.dll to the runtime folder."
+      ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}
+      COMMENT "Copying llcommon.dll to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}."
       )
 
   get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
@@ -1634,8 +1635,8 @@ if (WINDOWS)
         -E
         copy_if_different
         ${BUILT_SLPLUGIN}
-        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      COMMENT "Copying SLPlugin executable to the runtime folder."
+        ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}
+      COMMENT "Copying SLPlugin executable to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}."
       )
 
   get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
@@ -1646,8 +1647,8 @@ if (WINDOWS)
           -E
           copy_if_different
           ${BUILT_WEBKIT_PLUGIN}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-        COMMENT "Copying WebKit Plugin to the runtime folder."
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
+        COMMENT "Copying WebKit Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
         )
         
    get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
@@ -1658,8 +1659,8 @@ if (WINDOWS)
           -E
           copy_if_different
           ${BUILT_GSTREAMER_PLUGIN}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-        COMMENT "Copying Gstreamer Plugin to the runtime folder."
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
+        COMMENT "Copying Gstreamer Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
         )
         
   get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
@@ -1670,13 +1671,13 @@ if (WINDOWS)
           -E
           copy_if_different
           ${BUILT_QUICKTIME_PLUGIN}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-        COMMENT "Copying Quicktime Plugin to the runtime folder."
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
+        COMMENT "Copying Quicktime Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
         )
 
   # Copying the mime_types.xml file to app_settings
   set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us")
-  set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings")
+  set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings")
   add_custom_command(
       TARGET ${VIEWER_BINARY_NAME} POST_BUILD
       COMMAND ${CMAKE_COMMAND}
@@ -1693,7 +1694,7 @@ endif (WINDOWS)
 if (DARWIN)
 # Don't do this here -- it's taken care of by viewer_manifest.py
 #  add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin/
 #    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
 #  )
 endif (DARWIN)
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 8eaa0b2..7cf90c4 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,29 +1,83 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>37</string>
+      <key>default_grids_version</key><string>39</string>
     </map>
 
-    <!-- Local Host -->
+    <!-- 3rd Rock Grid -->
+    <map>
+        <key>gridname</key><string>3rd Rock Grid</string>
+        <key>gridnick</key><string>3rdRock</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://3rdrockgrid.com/</string>
+        <key>help</key><string>http://3rdrockgrid.com/</string>
+        <key>helperuri</key><string>http://grid.3rdrockgrid.com/3rg_money/</string>
+        <key>loginuri</key><string>http://grid.3rdrockgrid.com:8002/</string>
+        <key>loginpage</key><string>http://3rdrockgrid.com/startpage.php</string>
+        <key>website</key><string>http://3rdrockgrid.com/</string>
+        <key>register</key><string>http://3rdrockgrid.com/</string>
+        <key>password</key><string>http://3rdrockgrid.com/</string>
+        <key>support</key><string>http://3rdrockgrid.com/</string>
+        <key>version</key><string>1</string>
+    </map>
+
+    <!-- Avination -->
+    <map>
+        <key>gridname</key><string>Avination</string>
+        <key>gridnick</key><string>Avination</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://login.avination.net</string>
+        <key>helperuri</key><string>https://secure.3dhosting.de/</string>
+        <key>loginpage</key><string>https://www.avination.com/welcome.php</string>
+        <key>loginuri</key><string>https://login.avination.com</string>
+        <key>name</key><string>login.avination.net</string>
+        <key>password</key><string>https://www.avination.com/pwrecover.php</string>
+        <key>register</key><string>https://www.avination.com/join.php</string>
+    </map>
+
+    <!-- Craft (offspring of Cyberlandia) -->
+    <map>
+        <key>gridname</key><string>Craft - The Friendly World</string>
+        <key>gridnick</key><string>Craft</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.craft-world.org/</string>
+        <key>loginuri</key><string>http://craft-world.org:8002/</string>
+        <key>loginpage</key><string>http://www.craft-world.org/loginscreen.php</string>
+        <key>helperuri</key><string>http://webapp.craft-world.org/economy/</string>
+        <key>website</key><string>http://www.craft-world.org/</string>
+        <key>register</key><string>http://craft-world.org:8002/wifi/user/account/</string>
+        <key>password</key><string>http://craft-world.org:8002/wifi/forgotpassword</string>
+        <key>version</key><string>0</string>
+    </map>
+
+    <!-- FrancoGrid -->
     <map>
-      <key>gridnick</key><string>localhost</string>
-      <key>gridname</key><string>Local Host</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://127.0.0.1:9000/</string>
-      <key>loginpage</key><string />
-      <key>helperuri</key><string>http://127.0.0.1:9000/</string>
-      <key>version</key><string>1</string>
+        <key>gridname</key><string>Metavers Francophone FrancoGrid</string>
+        <key>gridnick</key><string>francogrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://francogrid.org/</string>
+        <key>help</key><string>http://francogrid.org/aide</string>
+        <key>helperuri</key><string>http://helper.main.francogrid.org/</string>
+        <key>loginpage</key><string>http://viewer.francogrid.org/</string>
+        <key>loginuri</key><string>http://login.francogrid.org/</string>
+        <key>name</key><string>login.francogrid.org</string>
+        <key>password</key><string>http://francogrid.org/user/password</string>
+        <key>register</key><string>http://francogrid.org/user/register</string>
     </map>
 
     <!-- GiantGrid -->
     <map>
-      <key>gridnick</key><string>giantgrid</string>
-      <key>gridname</key><string>GiantGrid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://Gianttest.no-ip.biz:8002/</string>
-      <key>loginpage</key><string>http://gianttest.no-ip.biz:80/gridsplash?method=login</string>
-      <key>helperuri</key><string>http://gianttest.no-ip.biz/giantmap/</string>
-      <key>version</key><string>0</string>
+        <key>gridname</key><string>GiantGrid</string>
+        <key>gridnick</key><string>GiantGrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://giantgrid.no-ip.biz:8002/</string>
+        <key>loginpage</key><string>http://www.giantgrid.nl</string>
+        <key>helperuri</key><string>http://giantgrid.no-ip.biz/XoopCube/html/modules/xoopensim/helper/</string>
+        <key>website</key><string>http://www.giantgrid.nl</string>
+        <key>register</key><string>http://giantgrid.no-ip.biz:8002/wifi/user/account/</string>
+        <key>password</key><string>http://giantgrid.no-ip.biz:8002/wifi/forgotpassword</string>
+        <key>support</key><string>http://gianttest.no-ip.biz/ticket/</string>
+        <key>version</key><string>1</string>
     </map>
 
     <!-- Infinite Grid -->
@@ -32,59 +86,126 @@
       <key>gridnick</key>  <string>infinitegrid</string>
       <key>platform</key>  <string>OpenSim</string>
       <key>loginuri</key>  <string>http://grid.infinitegrid.org:8002/</string>
-      <key>loginpage</key> <string>http://webfront.infinitegrid.org/loginscreen.php</string>
-      <key>helperuri</key> <string>http://www.infinitegrid.org/helper/</string>
-      <key>password</key>  <string>http://webfront.infinitegrid.org/</string>
-      <key>register</key>  <string>http://webfront.infinitegrid.org/</string>
-      <key>support</key>   <string>http://www.infinitegrid.org/help</string>
-      <key>website</key>   <string>http://www.infinitegrid.org/about/</string>
-      <key>search</key>    <string>http://webi.metaverseink.com/</string>
+      <key>loginpage</key> <string>http://www.infinitegrid.org/drupal/loginpage</string>
+      <key>helperuri</key> <string>http://www.infinitegrid.org/opensim/helper/</string>
+      <key>website</key>   <string>http://www.infinitegrid.org/drupal/</string>
+      <key>register</key>  <string>http://www.infinitegrid.org/drupal/</string>
+      <key>password</key>  <string>http://www.infinitegrid.org/drupal/</string>
+      <key>support</key>   <string>http://www.infinitegrid.org/drupla/Tags/help</string>
       <key>version</key>   <string>0</string>
     </map>
 
-    <!-- Infinite Grid dev-->
+    <!-- InWorldz -->
     <map>
-      <key>gridname</key>  <string>Infinite Grid dev</string>
-      <key>gridnick</key>  <string>infinitegriddev</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://grid.infinitegrid.org:8502/</string>
-      <key>loginpage</key> <string>http://www.infinitegrid.org/webdev/loginscreen.php</string>
-      <key>helperuri</key> <string>http://www.infinitegrid.org/webdev/helper/</string>
-      <key>password</key>  <string>http://www.infinitegrid.org/webdev/</string>
-      <key>register</key>  <string>http://www.infinitegrid.org/webdev/</string>
-      <key>support</key>   <string>http://www.infinitegrid.org/webdev/help</string>
-      <key>website</key>   <string>http://www.infinitegrid.org/webdev/about/</string>
-      <key>version</key>   <string>0</string>
+        <key>gridname</key><string>InWorldz</string>
+        <key>gridnick</key><string>InWorldz</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://inworldz.com/</string>
+        <key>help</key><string>http://inworldz.com/faq.php</string>
+        <key>loginuri</key><string>http://inworldz.com:8002/</string>
+        <key>loginpage</key><string>http://inworldz.com/loginscreen.php</string>
+        <key>helperuri</key><string>http://inworldz.com/</string>
+        <key>password</key><string>http://inworldz.com/</string>
+        <key>register</key><string>http://inworldz.com/register.php</string>
+        <key>support</key><string>http://inworldz.com/support.php</string>
+        <key>website</key><string>http://inworldz.com/</string>
+        <key>version</key><string>2</string>
     </map>
 
-    <!-- InWorldz -->
+    <!-- Island Oasis -->
     <map>
-      <key>gridname</key>  <string>InWorldz</string>
-      <key>gridnick</key>  <string>inworldz</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://inworldz.com:8002/</string>
-      <key>loginpage</key> <string>http://inworldz.com/loginscreen.php</string>
-      <key>helperuri</key> <string>http://inworldz.com/</string>
-      <key>password</key>  <string>http://inworldz.com/loginerror.php?error=2</string>
-      <key>register</key>  <string>http://inworldz.com/register.php</string>
-      <key>support</key>   <string>http://inworldz.com/support.php</string>
-      <key>website</key>   <string>http://inworldz.com/</string>
-      <key>version</key>   <string>2</string>
-    </map> 
+        <key>gridname</key><string>Island Oasis</string>
+        <key>gridnick</key><string>IslandOasis</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.islandoasis.biz/GridStats.aspx</string>
+        <key>help</key><string>http://www.islandoasis.biz/Support.aspx</string>
+        <key>helperuri</key><string>http://islandoasisgrid.biz:8020/OsCurrency/</string>
+        <key>loginpage</key><string>http://www.islandoasis.biz/welcome.aspx</string>
+        <key>loginuri</key><string>http://islandoasisgrid.biz:8002/</string>
+        <key>name</key><string>islandoasisgrid.biz:8002</string>
+        <key>password</key><string>http://www.islandoasis.biz/Login.aspx</string>
+        <key>register</key><string>http://www.islandoasis.biz/verification.aspx</string>
+    </map>
+
+    <!-- Local Host -->
+    <map>
+        <key>gridname</key><string>LocalHost</string>
+        <key>gridnick</key><string>LocalHost</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://127.0.0.1:9000/</string>
+        <key>loginpage</key><string />
+        <key>helperuri</key><string>http://127.0.0.1:9000/</string>
+        <key>version</key><string>1</string>
+    </map>
+
+    <!-- local Sim-on-a-stick -->
+    <map>
+        <key>gridname</key><string>Sim-on-a-Stick</string>
+        <key>gridnick</key><string>SimOnAStick</string>
+        <key>loginpage</key><string>http://127.0.0.1:9100/wifi/welcome.html</string>
+        <key>loginuri</key><string>http://localhost:9100</string>
+    </map>
+
+    <!-- Metropolis Metaversum -->
+    <map>
+        <key>gridname</key><string>Metropolis Metaversum</string>
+        <key>gridnick</key><string>Metropolis</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.hypergrid.org/metropolis/wiki</string>
+        <key>help</key><string>http://metropolis.hypergrid.org</string>
+        <key>helperuri</key><string>http://metropolis.hypergrid.org/currency/helper/</string>
+        <key>loginpage</key><string>http://metropolis.hypergrid.org</string>
+        <key>loginuri</key><string>http://hypergrid.org:8002/</string>
+        <key>name</key><string>hypergrid.org:8002</string>
+        <key>password</key><string>http://metropolis.hypergrid.org/oswi.php</string>
+        <key>register</key><string>http://www.hypergrid.org/metropolis/metro_rg.php</string>
+    </map>
+
+    <!-- New World Grid -->
+    <map>
+        <key>gridname</key><string>New World Grid</string>
+        <key>gridnick</key><string>newworldgrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://3d.newworldgrid.com:8002/</string>
+        <key>loginpage</key><string>http://www.newworldgrid.com/loginpage/</string>
+        <key>helperuri</key><string>http://3d.newworldgrid.com/services/helper/</string>
+        <key>website</key><string>http://www.newworldgrid.com/</string>
+        <key>support</key><string>http://www.newworldgrid.com/contact/</string>
+        <key>register</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=register</string>
+        <key>password</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=login</string>
+        <key>version</key><string>0</string>
+    </map>
+
+    <!-- ReactionGrid -->
+    <map>
+        <key>gridname</key><string>ReactionGrid</string>
+        <key>gridnick</key><string>ReactionGrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://reactiongrid.com/Default.aspx</string>
+        <key>help</key><string>http://reactiongrid.com/Support.aspx</string>
+        <key>loginuri</key><string>http://reactiongrid.com:8008/</string>
+        <key>loginpage</key><string>http://gsquared.info/portal</string>
+        <key>helperuri</key><string>http://reactiongrid.com:9000/</string>
+        <key>website</key><string>http://reactiongrid.com/Default.aspx</string>
+        <key>support</key><string>http://reactiongrid.com/Support.aspx</string>
+        <key>register</key><string>http://reactiongrid.com/Register.aspx</string>
+        <key>password</key><string>http://www.reactiongrid.com/Support/PasswordReset.aspx</string>
+        <key>version</key><string>0</string>
+    </map>
 
     <!-- ScienceSim -->
     <map>
-      <key>gridname</key>  <string>IEEE/ACM ScienceSim Virtual World</string>
-      <key>gridnick</key>  <string>sciencesim</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://grid.sciencesim.com/</string>
-      <key>loginpage</key> <string>http://island.sciencesim.com/scisim/loginscreen.php</string>
-      <key>helperuri</key> <string></string>
-      <key>password</key>  <string>http://island.sciencesim.com/scisim</string>
-      <key>register</key>  <string>http://island.sciencesim.com/scisim</string>
-      <key>support</key>   <string>http://island.sciencesim.com/wiki</string>
-      <key>website</key>   <string>http://island.sciencesim.com/about/</string>
-      <key>version</key>   <string>0</string>
+        <key>gridname</key><string>IEEE/ACM ScienceSim Virtual World</string>
+        <key>gridnick</key><string>ScienceSim</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://grid.sciencesim.com/</string>
+        <key>loginpage</key><string>http://island.sciencesim.com/scisim/loginscreen.php</string>
+        <key>helperuri</key><string></string>
+        <key>password</key><string>http://island.sciencesim.com/scisim</string>
+        <key>register</key><string>http://island.sciencesim.com/scisim</string>
+        <key>support</key><string>http://island.sciencesim.com/wiki</string>
+        <key>website</key><string>http://island.sciencesim.com/about/</string>
+        <key>version</key><string>0</string>
     </map>
 
     <!-- Slackdog -->
@@ -103,94 +224,46 @@
       <key>version</key>   <string>0</string>
     </map>
 
-    <!-- Sim-World Grid -->
+    <!-- Virtual Highway -->
     <map>
-      <key>gridname</key>  <string>Sim-World rid</string>
-      <key>gridnick</key>  <string>simworld</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://grid.sim-world.org:8003/</string>
-      <key>loginpage</key> <string>http://grid.sim-world.org/home/loginscreen/</string>
-      <key>helperuri</key> <string>http://grid.sim-world.org/home/gridservices07/</string>
-      <key>password</key>  <string>http://www.sim-world.org/index.php/loginregister</string>
-      <key>register</key>  <string>http://www.sim-world.org/index.php/loginregister</string>
-      <key>support</key>   <string>http://www.sim-world.org/index.php/support/selfhelp</string>
-      <key>website</key>   <string>http://www.sim-world.org/</string>
-      <key>search</key>    <string>http://www.sim-world.org/</string>
-      <key>version</key>   <string>0</string>
+        <key>gridname</key><string>Virtual Highway</string>
+        <key>gridnick</key><string>VirtualHighway</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.virtualhighway.us/about.php</string>
+        <key>helperuri</key><string>http://www.virtualhighway.us/griddal/</string>
+        <key>loginpage</key><string>http://www.virtualhighway.us/welcome.php</string>
+        <key>loginuri</key><string>http://login.virtualhighway.us:8002/</string>
+        <key>name</key><string>login.virtualhighway.us:8002</string>
+        <key>password</key><string>http://www.virtualhighway.us/users/lostPassword</string>
+        <key>register</key><string>http://www.virtualhighway.us/users/register</string>
     </map>
 
-    <!-- ReactionGrid -->
-    <map>
-      <key>gridnick</key><string>reactiongrid</string>
-      <key>gridname</key><string>ReactionGrid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://reactiongrid.com:8008/</string>
-      <key>loginpage</key><string>http://gsquared.info/portal</string>
-      <key>website</key><string>http://reactiongrid.com/Default.aspx</string>
-      <key>support</key><string>http://reactiongrid.com/Support.aspx</string>
-      <key>register</key><string>http://reactiongrid.com/Register.aspx</string>
-      <key>password</key><string>http://reactiongrid.com/Support/ResetPassword.aspx</string>
-      <key>version</key><string>0</string>
-    </map>
-
-    <!-- Role Play Worlds -->
-    <map>
-      <key>gridnick</key><string>roleplayworlds</string>
-      <key>gridname</key><string>Role Play Worlds</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.roleplayworlds.net:8002/</string>
-      <key>loginpage</key><string>http://roleplayworlds.net/loginscreen</string>
-      <key>helperuri</key><string>http://grid.roleplayworlds.net/</string>
-      <key>website</key><string>http://roleplayworlds.net/</string>
-      <key>support</key><string>http://roleplayworlds.net/help</string>
-      <key>register</key><string>http://roleplayworlds.net/register</string>
-      <key>password</key><string>http://roleplayworlds.net/password</string>
-      <key>version</key><string>1</string>
-    </map>
-
-    <!-- The New World Grid -->
-    <map>
-      <key>gridnick</key><string>thenewworldgrid</string>
-      <key>gridname</key><string>The New World Grid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://giantgrid.no-ip.biz:8002/</string>
-      <key>loginpage</key><string>http://www.giantgrid.nl</string>
-      <key>helperuri</key><string>http://giantgrid.no-ip.biz/XoopCube/html/modules/xoopensim/helper/</string>
-      <key>website</key><string>http://www.giantgrid.nl</string>
-      <key>register</key><string>http://giantgrid.no-ip.biz:8002/wifi/user/account/</string>
-      <key>password</key><string>http://giantgrid.no-ip.biz:8002/wifi/forgotpassword</string>
-      <key>support</key><string>http://gianttest.no-ip.biz/ticket/</string>
-      <key>version</key><string>1</string>
-    </map>
-
-    <!-- 3rd Rock Grid -->
+    <!-- virtyou -->
     <map>
-      <key>gridnick</key><string>3rdrock</string>
-      <key>gridname</key><string>3rd Rock Grid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.3rdrockgrid.com:8002/</string>
-      <key>loginpage</key><string>http://3rdrockgrid.com/startpage.php</string>
-      <key>helperuri</key><string>http://grid.3rdrockgrid.com/money/</string>
-      <key>website</key><string>http://3rdrockgrid.com/</string>
-      <key>register</key><string>http://3rdrockgrid.com/</string>
-      <key>password</key><string>http://3rdrockgrid.com/</string>
-      <key>support</key><string>http://3rdrockgrid.com/</string>
-      <key>version</key><string>1</string>
+        <key>gridname</key><string>virtyou MainGrid</string>
+        <key>gridnick</key><string>virtyou</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>help</key><string>http://virtyou.com/q/howto/</string>
+        <key>loginpage</key><string>http://virtyou.com/welcome/</string>
+        <key>loginuri</key><string>http://go.virtyou.com</string>
+        <key>password</key><string>http://virtyou.com/user/forgotten.html</string>
+        <key>register</key><string>http://virtyou.com/user/</string>
     </map>
 
     <!-- Your Alternative Life -->
     <map>
-      <key>gridnick</key><string>youralternativelife</string>
-      <key>gridname</key><string>Your Alternative Life</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid01.from-ne.com:8002/</string>
-      <key>loginpage</key><string>http://grid01.from-ne.com/tios/loginscreen3.php</string>
-      <key>helperuri</key><string>http://grid01.from-ne.com/tios/services/</string>
-      <key>website</key><string>http://www.youralternativelife.com</string>
-      <key>support</key><string>http://www.youralternativelife.com</string>
-      <key>register</key><string>http://www.youralternativelife.com</string>
-      <key>password</key><string>http://www.youralternativelife.com</string>
-      <key>version</key><string>0</string>
+        <key>gridname</key><string>Your Alternative Life</string>
+        <key>gridnick</key><string>YourAlternativeLife</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.youralternativelife.com</string>
+        <key>loginuri</key><string>http://grid01.from-ne.com:8002/</string>
+        <key>loginpage</key><string>http://grid01.from-ne.com/tios/loginscreen3.php</string>
+        <key>helperuri</key><string>http://grid01.from-ne.com/tios/services/</string>
+        <key>website</key><string>http://www.youralternativelife.com</string>
+        <key>support</key><string>http://www.youralternativelife.com</string>
+        <key>register</key><string>http://www.youralternativelife.com</string>
+        <key>password</key><string>http://www.youralternativelife.com</string>
+        <key>version</key><string>0</string>
     </map>
 
   </array>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e701c3e..5534ecc 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,6 +2,123 @@
 <llsd>
 <map>
 
+  <!-- begin RC hacking -->
+        <key>PrimMediaMasterEnabled</key>
+        <map>
+                <key>Comment</key>
+                <string>Whether or not Media on a Prim is enabled.</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>1</integer>
+        </map>
+        <key>PrimMediaMaxRetries</key>
+        <map>
+                <key>Comment</key>
+                <string>Maximum number of retries for media queries.</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>4</integer>
+        </map>
+        <key>PrimMediaRequestQueueDelay</key>
+        <map>
+                <key>Comment</key>
+                <string>Timer delay for fetching media from the queue (in seconds).</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>F32</string>
+                <key>Value</key>
+                <real>1.0</real>
+        </map>
+        <key>PrimMediaRetryTimerDelay</key>
+        <map>
+                <key>Comment</key>
+                <string>Timer delay for retrying on media queries (in seconds).</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>F32</string>
+                <key>Value</key>
+                <real>5.0</real>
+        </map>
+        <key>PrimMediaMaxSortedQueueSize</key>
+        <map>
+                <key>Comment</key>
+                <string>Maximum number of objects the viewer will load media for initially</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>100000</integer>
+        </map>
+        <key>PrimMediaMaxRoundRobinQueueSize</key>
+        <map>
+                <key>Comment</key>
+                <string>Maximum number of objects the viewer will continuously update media for</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>100000</integer>
+        </map>
+        <key>ShowMOAPRadar</key>
+        <map>
+                <key>Comment</key>
+                <string>Show the MOAP radar</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+        </map>
+        <key>FloaterMOAPRadarRect</key>
+        <map>
+                <key>Comment</key>
+                <string>Rectangle for MOAP Radar</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Rect</string>
+                <key>Value</key>
+                <array>
+                        <integer>0</integer>
+                        <integer>400</integer>
+                        <integer>200</integer>
+                        <integer>0</integer>
+                </array>
+        </map>
+        <key>MOAPRadarKeepOpen</key>
+        <map>
+                <key>Comment</key>
+                <string>Keeps MOAP radar updates running in background</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+        </map>
+        <key>MOAPRadarUpdateRate</key>
+        <map>
+                <key>Comment</key>
+                <string>MOAP Radar update rate (0 = high, 1 = medium, 2 = low)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>1</integer>
+        </map>
+
   <!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
   
   <!-- begin Aurora-specific settings -->
@@ -14694,6 +14811,17 @@
         <real>1.0</real>
       </array>
     </map>
+        <key>moapbeacon</key>
+        <map>
+                <key>Comment</key>
+                <string>Beacon / Highlight MOAP sources</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+        </map>
     <key>particlesbeacon</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 9777114..e1314f7 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -302,7 +302,6 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         {
                                                 if (i >> z)
                                                 {
-                                                        LLVector3 agentPos = gAgent.getPositionAgent();
                                                         LLViewerRegion* agentRegionp = gAgent.getRegion();
                                                         if(agentRegionp)
                                                         {
diff --git a/linden/indra/newview/floaterotr.cpp b/linden/indra/newview/floaterotr.cpp
index a655fd7..4c78d4c 100644
--- a/linden/indra/newview/floaterotr.cpp
+++ b/linden/indra/newview/floaterotr.cpp
@@ -54,7 +54,7 @@ BOOL FloaterOTR::postBuild()
         childSetAction("btn_cancel", onClickCancel, this);
 
         childSetValue("EmeraldUseOTR", LLSD((S32)gSavedSettings.getU32("EmeraldUseOTR")));
-        childSetValue("EmeraldUseOTRInTypingStop", gSavedSettings.getBOOL("EmeraldUseOTRInTypingStop"));
+        childSetValue("EmeraldOTRInTypingStop", gSavedSettings.getBOOL("EmeraldOTRInTypingStop"));
         getChild<LLButton>("otr_help_btn")->setClickedCallback(onClickOtrHelp, this);
 
         return TRUE;
@@ -89,7 +89,7 @@ void FloaterOTR::apply()
     U32 otrpref = childGetValue("EmeraldUseOTR").asReal();
 
     gSavedSettings.setU32("EmeraldUseOTR", otrpref);
-    gSavedSettings.setBOOL("EmeraldUseOTRInTypingStop", childGetValue("EmeraldUseOTRInTypingStop").asBoolean());
+    gSavedSettings.setBOOL("EmeraldOTRInTypingStop", childGetValue("EmeraldOTRInTypingStop").asBoolean());
     // otrpref: 0 == Require OTR, 1 == Request OTR, 2 == Accept OTR, 3 == Decline OTR
     if (3 == otrpref)
         OTR_Wrapper::stopAll();
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index 4c46d3e..11b144e 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -49,9 +49,10 @@
 #include "llviewernetwork.h" // gMacAddress
 #include "llweb.h"
 #include "llxorcipher.h"        // saved password, MAC address
+#include "llblowfishcipher.h"
 
 #include "hipporestrequest.h"
-
+#include <boost/algorithm/string.hpp>
 
 // ********************************************************************
 // Global Variables
@@ -87,6 +88,7 @@ HippoGridInfo::HippoGridInfo(const std::string& gridNick) :
         mFirstName(LLStringUtil::null),
         mLastName(LLStringUtil::null),
         mPasswordAvatar(LLStringUtil::null),
+        mEncryptedPassword(LLStringUtil::null),
         mXmlState(XML_VOID),
         mVoiceConnector("SLVoice"),
         mRenderCompat(false),
@@ -101,9 +103,27 @@ HippoGridInfo::HippoGridInfo(const std::string& gridNick) :
         mGridNick = sanitizeGridNick(nick);
 }
 
+// Check if this really is a SecondLife grid, to prevent cheating.
+void HippoGridInfo::checkLoginURIforSecondLifeness()
+{
+        LLURI loginURI(mLoginURI);
+        std::string host = loginURI.hostName();
+        size_t found;
+
+        boost::algorithm::to_lower(host);
+
+        found = host.rfind("lindenlab.com");
+        if ((found + 13) == host.size())
+            mPlatform = PLATFORM_SECONDLIFE;
+        found = host.rfind("secondlife.com");
+        if ((found + 14) == host.size())
+            mPlatform = PLATFORM_SECONDLIFE;
+}
+
 void HippoGridInfo::setPlatform(Platform platform)
 {
         mPlatform = platform;
+        checkLoginURIforSecondLifeness();
         if (mPlatform == PLATFORM_SECONDLIFE)
         {
                 mCurrencySymbol = "L$";
@@ -136,6 +156,7 @@ void HippoGridInfo::setLoginURI(const std::string& loginURI)
 {
         std::string uri = loginURI;
         mLoginURI = sanitizeURI(uri);
+        checkLoginURIforSecondLifeness();
 }
 
 void HippoGridInfo::setHelperURI(const std::string& helperURI)
@@ -404,12 +425,115 @@ void HippoGridInfo::formatFee(std::string &fee, S32 cost, bool showFree) const
         }
 }
 
+const S32 HASHED_LENGTH = 32;
+
+void HippoGridInfo::setEncryptedPassword(const std::string& encrypted_password)
+{
+        int i;
+        LLBlowfishCipher cipher(gMACAddress, 6);
+        size_t encrypted_size = cipher.requiredEncryptionSpace(HASHED_LENGTH);
+
+        if (encrypted_password.empty())
+        {
+                // Check if we have a password hash to encrypt.
+                if (mPasswordAvatar.empty())
+                        mEncryptedPassword = "";
+                else
+                {
+                        // In theory, this is used to convert old style Imprudence 1.4 beta 2 and earlier passwords.
+                        // Encipher with MAC address
+                        char out[HASHED_LENGTH * 2 + 1];
+
+/*  indra/llmessage/llmail.cpp says "blowfish-not-supported-on-windows", but we shall see.
+#if LL_WINDOWS
+                        LLXORCipher cipherX(gMACAddress, 6);
+                        cipherX.encrypt(mPasswordAvatar.c_str(), HASHED_LENGTH);
+#else
+*/
+                        U8* encrypted = new U8[encrypted_size];
+                        U8* password = (U8 *) mPasswordAvatar.c_str();
+
+                        cipher.encrypt(password, HASHED_LENGTH, encrypted, HASHED_LENGTH);
+                        for (i = 0; i < HASHED_LENGTH; i++)
+                        {
+                                sprintf(out + i * 2, "%02x", encrypted[i]);
+                        }
+                        out[HASHED_LENGTH * 2]='\0';
+                        mEncryptedPassword.assign(out);
+                }
+
+                return;
+        }
+
+        if (encrypted_password == mEncryptedPassword)
+        {
+                return;
+        }
+
+        // Max "actual" password length is 16 characters.
+        // Hex digests are always 32 characters.
+        // Encrypted passwords stored as hex digits are 64 characters.
+        if (encrypted_password.length() == (HASHED_LENGTH * 2))
+        {
+                // This is actually encrypted, as found in the grids file.
+                mEncryptedPassword.assign(encrypted_password);
+        }
+        else
+        {
+                // Should never happen, this is only called from the file reading bit.
+                llwarns << "Encrypted password corrupted." << llendl;
+                return;
+        }
+
+        std::string hashed_password("");
+
+        // Decrypt it for the password hash.
+        // Decipher with MAC address
+        U8 buffer[HASHED_LENGTH + 1];
+        char in[HASHED_LENGTH * 2 + 1];
+
+        LLStringUtil::copy(in, mEncryptedPassword.c_str(), HASHED_LENGTH * 2 + 1);
+/*  indra/llmessage/llmail.cpp says "blowfish-not-supported-on-windows", but we shall see.
+#if LL_WINDOWS
+        for (i = 0; i < HASHED_LENGTH; i++)
+        {
+                sscanf(in + i * 2, "%2hhx", &buffer[i]);
+        }
+        // Note that an XOR "cipher" is a lousy one when the secret is repeated several times like it is here.
+        LLXORCipher cipher(gMACAddress, 6);
+        cipher.decrypt(buffer, HASHED_LENGTH);
+#else
+*/
+        U8* encrypted = new U8[encrypted_size];
+        for (i = 0; i < HASHED_LENGTH; i++)
+        {
+                sscanf(in + i * 2, "%2hhx", &encrypted[i]);
+        }
+        // Not sure why, but this prints a warning saying it failed, even though it works.  Which does not matter that much, we don't use the return value anyway.
+        cipher.decrypt(encrypted, HASHED_LENGTH, buffer, HASHED_LENGTH);
+        buffer[HASHED_LENGTH] = '\0';
+
+        // Check to see if the mac address generated a bad hashed
+        // password. It should be a hex-string or else the mac adress has
+        // changed. This is a security feature to make sure that if you
+        // get someone's grid_info.xml file, you cannot hack their account.
+        // This is a lousy way to check.
+        if (is_hex_string(buffer, HASHED_LENGTH))
+        {
+                hashed_password.assign((char*)buffer);
+        }
+
+        mPasswordAvatar.assign(hashed_password);
+}
 
 void HippoGridInfo::setPassword(const std::string& unhashed_password)
 {
+        int i;
+
         if (unhashed_password.empty())
         {
                 mPasswordAvatar = "";
+                mEncryptedPassword = "";
                 return;
         }
 
@@ -435,59 +559,38 @@ void HippoGridInfo::setPassword(const std::string& unhashed_password)
                 hashed_password = munged_password;
         }
 
-        // need to fix the bug in this
-        /*
-
+        // Encrypt it for storing in the grids file.
         // Encipher with MAC address
-        const S32 HASHED_LENGTH = 32;
-        U8 buffer[HASHED_LENGTH+1];
-
-        LLStringUtil::copy((char*)buffer, hashed_password.c_str(), HASHED_LENGTH+1);
+        char out[HASHED_LENGTH * 2 + 1];
 
-        LLXORCipher cipher(gMACAddress, 6);
-        cipher.encrypt(buffer, HASHED_LENGTH);
+/*  indra/llmessage/llmail.cpp says "blowfish-not-supported-on-windows", but we shall see.
+#if LL_WINDOWS
+        LLXORCipher cipherX(gMACAddress, 6);
+        cipherX.encrypt(hashed_password.c_str(), HASHED_LENGTH);
+#else
+*/
+        LLBlowfishCipher cipher(gMACAddress, 6);
+        size_t encrypted_size = cipher.requiredEncryptionSpace(HASHED_LENGTH);
+        U8* encrypted = new U8[encrypted_size];
+        U8* password = (U8 *) hashed_password.c_str();
 
-        mPasswordAvatar.assign((char*)buffer);
-        */
+        cipher.encrypt(password, HASHED_LENGTH, encrypted, HASHED_LENGTH);
+        for (i = 0; i < HASHED_LENGTH; i++)
+        {
+                sprintf(out + i * 2, "%02x", encrypted[i]);
+        }
+        out[HASHED_LENGTH * 2]='\0';
+        mEncryptedPassword.assign(out);
         mPasswordAvatar.assign(hashed_password);
 }
 
+std::string HippoGridInfo::getEncryptedPassword() const
+{
+        return mEncryptedPassword;
+}
 
 std::string HippoGridInfo::getPassword() const
 {
-        // need to fix the bug in this
-        /*
-        if (mPasswordAvatar.empty() || mPasswordAvatar.length() == 32)
-        {
-                return mPasswordAvatar;
-        }
-
-        std::string hashed_password("");
-
-        // UUID is 16 bytes, written into ASCII is 32 characters
-        // without trailing \0
-        const S32 HASHED_LENGTH = 32;
-        U8 buffer[HASHED_LENGTH+1];
-
-        LLStringUtil::copy((char*)buffer, mPasswordAvatar.c_str(), HASHED_LENGTH+1);
-        
-        // Decipher with MAC address
-        LLXORCipher cipher(gMACAddress, 6);
-        cipher.decrypt(buffer, HASHED_LENGTH);
-
-        buffer[HASHED_LENGTH] = '\0';
-
-        // Check to see if the mac address generated a bad hashed
-        // password. It should be a hex-string or else the mac adress has
-        // changed. This is a security feature to make sure that if you
-        // get someone's grid_info.xml file, you cannot hack their account.
-        if (is_hex_string(buffer, HASHED_LENGTH))
-        {
-                hashed_password.assign((char*)buffer);
-        }
-
-        return hashed_password;
-        */
         return mPasswordAvatar;
 }
 
@@ -890,7 +993,9 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
                         if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]);
                         if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]);
                         if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]);
+                        // Reading this one coz there are some old files in the wild that have it, but not encryptedpassword.
                         if (gridMap.has("avatarpassword")) grid->setPassword(gridMap["avatarpassword"]);
+                        if (gridMap.has("encryptedpassword")) grid->setEncryptedPassword(gridMap["encryptedpassword"]);
                         if (gridMap.has("username")) grid->setUsername(gridMap["username"]);
                         if (gridMap.has("username_compat")) grid->setUsernameCompat(gridMap["username_compat"]);
                         if (newGrid) addGrid(grid);
@@ -926,8 +1031,7 @@ void HippoGridManager::saveFile()
                 gridInfo[i]["password"] = grid->getPasswordURL();
                 gridInfo[i]["firstname"] = grid->getFirstName();
                 gridInfo[i]["lastname"] = grid->getLastName();
-                gridInfo[i]["avatarpassword"] = grid->getPassword();
-                
+                gridInfo[i]["encryptedpassword"] = grid->getEncryptedPassword();
                 gridInfo[i]["search"] = grid->getSearchURL();
                 gridInfo[i]["render_compat"] = grid->isRenderCompat();
 
diff --git a/linden/indra/newview/hippogridmanager.h b/linden/indra/newview/hippogridmanager.h
index c983c9d..c289349 100644
--- a/linden/indra/newview/hippogridmanager.h
+++ b/linden/indra/newview/hippogridmanager.h
@@ -89,6 +89,7 @@ public:
         const std::string& getLastName()                        const { return mLastName; }
         const std::string& getUsername()                        const { return mUsername; }
         std::string getPassword()                               const;
+        std::string getEncryptedPassword()                      const;
         const std::string& getVoiceConnector()          const { return mVoiceConnector; }
         S32 getMaxAgentGroups()                                         const { return mMaxAgentGroups; }
         const std::string& getCurrencySymbol()          const { return mCurrencySymbol; }
@@ -115,6 +116,7 @@ public:
         void setFirstName(const std::string& firstName)                         { mFirstName = firstName; }
         void setLastName(const std::string& lastName)                           { mLastName = lastName; }
         void setPassword(const std::string& unhashed_password);
+        void setEncryptedPassword(const std::string& encrypted_password);
         void setVoiceConnector(const std::string& vc)                           { mVoiceConnector = vc; }
         void setCurrencySymbol(const std::string& sym)                          { mCurrencySymbol = sym.substr(0, 3); }
         void setRealCurrencySymbol(const std::string& sym)                      { mRealCurrencySymbol = sym.substr(0, 3); }
@@ -146,6 +148,7 @@ private:
         std::string mFirstName;
         std::string mLastName;
         std::string mPasswordAvatar;
+        std::string mEncryptedPassword;
         bool            mRenderCompat;
         S32                     mMaxAgentGroups;
 
@@ -165,6 +168,8 @@ private:
         };
         XmlState mXmlState;
 
+        void checkLoginURIforSecondLifeness();
+
         static std::string sanitizeURI(std::string &uri);
         void formatFee(std::string &fee, S32 cost, bool showFree) const;
 
diff --git a/linden/indra/newview/hippoupdate.h b/linden/indra/newview/hippoupdate.h
deleted file mode 100644
index 559c8b3..0000000
--- a/linden/indra/newview/hippoupdate.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIPPO_UPDATE_H__
-#define __HIPPO_UPDATE_H__
-
-
-class HippoUpdate
-{
-  public:
-        static bool checkUpdate();
-};
-
-
-#endif
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index c551919..a396381 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -9,15 +9,15 @@
 ; These will change
 AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=Imprudence Viewer Experimental
-AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release
+AppVerName=Imprudence Viewer 1.4.0.3 exp 1 windows test release
 DefaultDirName={pf}\ImprudenceExperimental
 DefaultGroupName=Imprudence Viewer Experimental
 VersionInfoProductName=Imprudence Viewer Experimental
-OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test
-VersionInfoVersion=1.4.0
-VersionInfoTextVersion=1.4.0
-VersionInfoProductVersion=1.4.0
-AppVersion=1.4.0
+OutputBaseFilename=Imprudence-1.4.0.3-exp-1-windows-test
+VersionInfoVersion=1.4.0.3
+VersionInfoTextVersion=1.4.0.3
+VersionInfoProductVersion=1.4.0.3
+AppVersion=1.4.0.3
 VersionInfoCopyright=2011
 
 ; These won't change
diff --git a/linden/indra/newview/installers/windows/meta-impy_installer_template.iss b/linden/indra/newview/installers/windows/meta-impy_installer_template.iss
index 6731402..17aac3e 100644
--- a/linden/indra/newview/installers/windows/meta-impy_installer_template.iss
+++ b/linden/indra/newview/installers/windows/meta-impy_installer_template.iss
@@ -8,16 +8,16 @@
 ; Imp Experimental ID:  1B3E68BC-13EB-4277-9439-CB5FF9259460
 
 ; These will change
-AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8}
+AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=%%APPNAME%%
 AppVerName=%%APPVERNAME%%
 DefaultDirName={pf}\meta-impy
 DefaultGroupName=meta-impy Viewer
 VersionInfoProductName=%%APPNAME%%
 OutputBaseFilename=%%INSTALLERFILENAME%%
-VersionInfoVersion=%%VERSION%%
+VersionInfoVersion=%%VERSIONNUMBER%%
 VersionInfoTextVersion=%%VERSION%%
-VersionInfoProductVersion=%%VERSION%%
+VersionInfoProductVersion=%%VERSIONNUMBER%%
 AppVersion=%%VERSION%%
 VersionInfoCopyright=2011
 
@@ -307,7 +307,7 @@ begin
     Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
   end else begin
     Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
-  end
+  end;
 
   if Success = TRUE then begin
     if V = 1 then begin
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe
new file mode 100755
index 0000000..1421c29
--- /dev/null
+++ b/linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe
diff --git a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 338fc26..3f2378a 100755
--- a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -22,13 +22,12 @@ else
 fi
 
 # Register handler for KDE-aware apps
-if [ -z "$KDEHOME" ]; then
-    KDEHOME=~/.kde
-fi
-LLKDEPROTDIR=${KDEHOME}/share/services
-if [ -d "$LLKDEPROTDIR" ]; then
-    LLKDEPROTFILE=${LLKDEPROTDIR}/secondlife.protocol
-    cat > ${LLKDEPROTFILE} <<EOF || echo Warning: Did not register secondlife:// handler with KDE: Could not write ${LLKDEPROTFILE}
+for LLKDECONFIG in kde-config kde4-config; do
+    if [ `which $LLKDECONFIG` ]; then
+        LLKDEPROTODIR=`$LLKDECONFIG --path services | cut -d ':' -f 1`
+        if [ -d "$LLKDEPROTODIR" ]; then
+            LLKDEPROTOFILE=${LLKDEPROTODIR}/secondlife.protocol
+            cat > ${LLKDEPROTOFILE} <<EOF || echo Warning: Did not register secondlife:// handler with KDE: Could not write ${LLKDEPROTOFILE} 
 [Protocol]
 exec=${HANDLER} '%u'
 protocol=secondlife
@@ -41,6 +40,8 @@ writing=false
 makedir=false
 deleting=false
 EOF
-else
-    echo Info: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist. You can safely ignore this if you are not using KDE.
-fi
+        else
+            echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTODIR does not exist.
+        fi
+    fi
+done
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 85a1b36..dd74cde 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -1613,8 +1613,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
         abs_target_offset.abs();
 
         LLVector3 target_offset_dir = target_offset_origin;
-        F32 object_radius = mFocusObject->getVObjRadius();
-
         BOOL target_outside_object_extents = FALSE;
 
         for (U32 i = VX; i <= VZ; i++)
@@ -1708,18 +1706,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
 
         LLVector3 camera_offset_object(getCameraPositionAgent() - mFocusObject->getPositionAgent());
 
-        // length projected orthogonal to target offset
-        F32 camera_offset_dist = (camera_offset_object - target_offset_dir * (camera_offset_object * target_offset_dir)).magVec();
-
-        // calculate whether the target point would be "visible" if it were outside the bounding box
-        // on the opposite of the splitting plane defined by object_split_axis;
-        BOOL exterior_target_visible = FALSE;
-        if (camera_offset_dist > object_radius)
-        {
-                // target is visible from camera, so turn off fov zoom
-                exterior_target_visible = TRUE;
-        }
-
         F32 camera_offset_clip = camera_offset_object * object_split_axis;
         F32 target_offset_clip = target_offset_dir * object_split_axis;
 
@@ -2538,12 +2524,10 @@ void LLAgent::autoPilot(F32 *delta_yaw)
                 *delta_yaw = yaw;
 
                 // Compute when to start slowing down and when to stop
-                F32 stop_distance = mAutoPilotStopDistance;
                 F32 slow_distance;
                 if (getFlying())
                 {
                         slow_distance = llmax(6.f, mAutoPilotStopDistance + 5.f);
-                        stop_distance = llmax(2.f, mAutoPilotStopDistance);
                 }
                 else
                 {
@@ -3719,7 +3703,6 @@ F32	LLAgent::calcCameraFOVZoomFactor()
         else if (mFocusObject.notNull() && !mFocusObject->isAvatar())
         {
                 // don't FOV zoom on mostly transparent objects
-                LLVector3 focus_offset = mFocusObjectOffset;
                 F32 obj_min_dist = 0.f;
                 if (!gSavedSettings.getBOOL("DisableMinZoomDist"))
                         calcCameraMinDistance(obj_min_dist);
@@ -3746,9 +3729,8 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
         // Compute base camera position and look-at points.
         F32                     camera_land_height;
         LLVector3d      frame_center_global = mAvatarObject.isNull() ? getPositionGlobal() 
-                                                                                                                         : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
-                
-        LLVector3   upAxis = getUpAxis();
+                          : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
+
         BOOL            isConstrained = FALSE;
         LLVector3d      head_offset;
         head_offset.setVec(mThirdPersonHeadOffset);
@@ -3883,7 +3865,6 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                         // set the global camera position
                         LLVector3d camera_offset;
                         
-                        LLVector3 av_pos = mAvatarObject.isNull() ? LLVector3::zero : mAvatarObject->getRenderPosition();
                         camera_offset.setVec( local_camera_offset );
                         camera_position_global = frame_center_global + head_offset + camera_offset;
 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c30bf35..7040cd1 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -179,7 +179,6 @@
 
 #include "hippogridmanager.h"
 #include "hippolimits.h"
-#include "hippoupdate.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -616,6 +615,11 @@ bool LLAppViewer::init()
         // Always add the version to the top of the log--makes debugging easier -- MC
         llinfos << ViewerInfo::prettyInfo() << llendl;
 
+        // Always fetch the Ethernet MAC address, needed both for login
+        // and password load.  Need to do this before initConfiguration(),
+        // as the password loading part needs the MAC.
+        LLUUID::getNodeID(gMACAddress);
+
     if (!initConfiguration())
                 return false;
 
@@ -748,10 +752,6 @@ bool LLAppViewer::init()
                 return false;
         }
 
-        // Always fetch the Ethernet MAC address, needed both for login
-        // and password load.
-        LLUUID::getNodeID(gMACAddress);
-
         // Prepare for out-of-memory situations, during which we will crash on
         // purpose and save a dump.
 #if LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5a383bc..ee49752 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -494,7 +494,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
         //scaling
         LLVector3 target_scale = mVObjp->getScale();
         LLVector3 old_scale = mCurrentScale;
-        LLVector3 dest_scale = target_scale;
         
         // Damping
         F32 dist_squared = 0.f;
@@ -834,7 +833,6 @@ const LLVector3* LLDrawable::getSpatialExtents() const
 
 void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max)
 { 
-        LLVector3 size = max - min;
         mExtents[0] = min; 
         mExtents[1] = max; 
 }
@@ -1098,7 +1096,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera)
         LLCamera ret = camera;
         LLXformMatrix* mat = mDrawable->getXform();
         LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix();
-        LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix());
 
         LLVector3 delta = ret.getOrigin() - center;
         LLQuaternion rot = ~mat->getRotation();
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/llettherebelight.cpp
index 599a527..7fc2a3d 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/llettherebelight.cpp
@@ -1,9 +1,10 @@
 /**
- * @file lightshare.cpp
- * @brief Handler for Meta7 Lightshare (region-side Windlight settings).
+ * @file llettherebelight.cpp
+ * @brief Handler for Meta7 Lightshare (region-side Windlight settings), and other methods of sharing WindLight.
  *
  * Copyright (c) 2010, Tom Grimshaw (Tom Meta)
  * Copyright (c) 2010, Jacek Antonelli
+ * Copyright (c) 2012, David Seikel
  *
  * The source code in this file ("Source Code") is provided to you
  * under the terms of the GNU General Public License, version 2.0
@@ -27,7 +28,6 @@
  */
 
 
-#include "lightshare.h"
 
 #include "linden_common.h"
 #include "llviewercontrol.h"
@@ -38,30 +38,26 @@
 #include "message.h"
 #include "meta7windlight.h"
 
+#include "llettherebelight.h"
 
-const std::string WindlightMessage::sWaterPresetName  = "(Region settings)";
-const std::string WindlightMessage::sSkyPresetName    = "(Region settings)";
-const std::string WindlightMessage::sBackupWaterPresetName = "(Backup settings)";
-const std::string WindlightMessage::sBackupSkyPresetName = "(Backup settings)";
+#include "llagent.h"
+#include "llworld.h"
 
-// Backups.
-LLWaterParamSet waterBackup;
-LLWLParamSet skyBackup;
-//LLUUID* waterNormalBackup = NULL;
-bool animatorIsRunning = true;
-bool animatorUseEstateTime = true;
-bool backup = false;
 
-WindlightMessage* WindlightMessage::sMostRecent = NULL;
-LLTimer* WindlightMessage::sIgnoreTimer = new LLTimer();
-bool WindlightMessage::sIgnoreRegion = false;
+const std::string LightShare::sRegionPresetName = "(Region settings)";
+const std::string LightShare::sParcelPresetName = "(Parcel settings)";
+const std::string LightShare::sRLVPresetName = "(RLV settings)";
 
 
-WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
+LLWaterParamSet* LightShare::mWater = NULL;
+LLWLParamSet* LightShare::mSky = NULL;
+LLUUID* LightShare::mWaterNormal = NULL;
+LLTimer* LightShare::sIgnoreTimer = new LLTimer();
+bool LightShare::sIgnoreRegion = false;
+
+
+LightShare::LightShare( LLMessageSystem* msg ) :
         mPacket(NULL),
-        mWater(NULL),
-        mSky(NULL),
-        mWaterNormal(NULL),
         mIsValid(false)
 {
         std::string method;
@@ -86,10 +82,7 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
                                  buf, size, 0, 249);
 
         mWater = new LLWaterParamSet();
-//      mSky = new LLWLParamSet();
-        LLWLParamManager * wl_param_mgr = LLWLParamManager::instance();
-        static LLWLParamSet & sSky = wl_param_mgr->mCurParams;
-        mSky = &sSky;
+        mSky = new LLWLParamSet();
 
         mWaterNormal = new LLUUID();
 
@@ -102,21 +95,21 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
 }
 
 
-WindlightMessage::~WindlightMessage()
+LightShare::~LightShare()
 {
         delete mWater;
-//      delete mSky;
+        delete mSky;
         delete mWaterNormal;
 }
 
 
 // static
-void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
+void LightShare::processWindlight(LLMessageSystem* msg, void**)
 {
         if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
                 return;
 
-        WindlightMessage* wl = new WindlightMessage(msg);
+        LightShare* wl = new LightShare(msg);
 
         if (!wl)
                 return;
@@ -127,16 +120,28 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
                 return;
         }
 
+        applyMaybe(wl->mWater, wl->mWaterNormal, wl->mSky);
+}
+
+
+//static
+void LightShare::applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisWaterNormal, LLWLParamSet* thisSky)
+{
+        if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
+                return;
+
         std::string water = LLWaterParamManager::instance()->mCurParams.mName;
         std::string sky = LLWLParamManager::instance()->mCurParams.mName;
 
         // If they are using region settings already, or LightShare is
         // always allowed, just apply the new settings, don't bother asking.
         if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
-            (sky == sSkyPresetName && water == sWaterPresetName) )
+            (sky == sRegionPresetName && water == sRegionPresetName) )
         {
-                wl->apply();
-                delete wl;
+                mSky = thisSky;
+                mWater = thisWater;
+                mWaterNormal = thisWaterNormal;
+                apply(mWater, mWaterNormal, mSky, WL_SCOPE_REGION);
                 return;
         }
 
@@ -145,41 +150,36 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
                 // The user recently ignored a windlight message, so ignore
                 // this one too, and restart the timer.
                 restartIgnoreTimer();
-                delete wl;
                 return;
         }
 
         if(sIgnoreRegion)
         {
                 // We are ignoring new settings until user enters a new region.
-                delete wl;
                 return;
         }
 
-        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
-            sMostRecent == NULL )
+        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK && mSky == NULL && mWater == NULL)
         {
                 // No most recent, so store this and create notification
                 // asking the user whether to apply or not.
-                sMostRecent = wl;
-                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
+                mSky = thisSky;
+                mWater = thisWater;
+                mWaterNormal = thisWaterNormal;
+                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(),
                                                 boost::bind(&applyCallback, _1, _2));
-                return;
         }
         else
         {
-                // No new notification (to avoid spamming the user), just
-                // store this as most recent.
-                delete sMostRecent;
-                sMostRecent = wl;
-                return;
+                // No new notification (to avoid spamming the user, we do keep the saves from above)
+                mSky = thisSky;
+                mWater = thisWater;
+                mWaterNormal = thisWaterNormal;
         }
 }
 
-
 // static
-bool WindlightMessage::applyCallback(const LLSD& notification,
-                                     const LLSD& response)
+bool LightShare::applyCallback(const LLSD& notification, const LLSD& response)
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
 
@@ -187,7 +187,8 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
         {
                 case 0:{
                         // "Apply"
-                        sMostRecent->apply();
+                        apply(mWater, mWaterNormal, mSky, WL_SCOPE_REGION);
+
                         break;
                 }
                 case 1:{
@@ -202,41 +203,18 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
                 }
         }
 
-        delete sMostRecent;
-        sMostRecent = NULL;
-
         return false;
 }
 
-
 // static
-void WindlightMessage::resetRegion()
+void LightShare::resetRegion()
 {
         sIgnoreRegion = false;
-
-// According to Melanie Thielker -
-// The new WindlightReset message from OpenSim is for resetting Windlight presets when leaving a sim that uses Lightshare.
-// Hopefully if you are moving to a sim that has new LightShare data, that gets sent after this reset, or the reset is never sent.
-        if (backup)
-        {
-            LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
-            LLWLParamManager* sky_mgr = LLWLParamManager::instance();
-
-            llinfos << "Restoring WindLight presets " << waterBackup.mName << " and " << skyBackup.mName <<  "." << llendl;
-            water_mgr->loadPreset(waterBackup.mName, true);
-            // Don't think we need to do this.
-            //if (waterNormalBackup)
-                //water_mgr->setNormalMapID(*waterNormalBackup);
-            sky_mgr->mAnimator.mIsRunning = animatorIsRunning;
-            sky_mgr->mAnimator.mUseLindenTime = animatorUseEstateTime;
-            sky_mgr->loadPreset(skyBackup.mName, true);
-            backup = false;
-        }
+        apply(NULL, NULL, NULL, WL_SCOPE_REGION);
 }
 
-
 // static
-void WindlightMessage::restartIgnoreTimer()
+void LightShare::restartIgnoreTimer()
 {
         F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
         sIgnoreTimer->start();
@@ -244,65 +222,219 @@ void WindlightMessage::restartIgnoreTimer()
 }
 
 // static
-bool WindlightMessage::ignoreTimerHasExpired()
+bool LightShare::ignoreTimerHasExpired()
 {
         return sIgnoreTimer->hasExpired();
 }
 
+// TODO - have regionSet and parcelSet be arrays, so we can deal with height zones.
+static struct WLCombined userSet, regionSet, parcelSet, RLVSet;
 
-bool WindlightMessage::apply()
-{
-        LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
-        LLWLParamManager* sky_mgr = LLWLParamManager::instance();
+// TODO - should spread this merging stuff around,
+//        so that eventually we can get rid of almost identical code for water and sky.
+//        Then one of these two methods goes away.
 
-        if (!backup)
+//static
+void LightShare::mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet)
+{
+        for(LLSD::map_const_iterator i = thisSet->mParamValues.beginMap();
+                i != thisSet->mParamValues.endMap();
+                ++i)
         {
-            llinfos << "Backing up WindLight presets '" << water_mgr->mCurParams.mName << " and " << sky_mgr->mCurParams.mName << "'." << llendl;
-            waterBackup = water_mgr->mCurParams;
-            //waterNormalBackup = waterBackup->getNormalMapID();
-            skyBackup = sky_mgr->mCurParams;
-            animatorIsRunning = sky_mgr->mAnimator.mIsRunning;
-            animatorUseEstateTime = sky_mgr->mAnimator.mUseLindenTime;
-            backup = true;
+                const std::string& param = i->first;
+
+                if(i->second.isArray())
+                {
+                        for (int j = 0; j < i->second.size(); j++)
+                        {
+                                oldSet->mParamValues[param][j] = i->second[j].asReal();
+                        }
+                }
+                else if(i->second.isReal())
+                  oldSet->mParamValues[param] = i->second.asReal();
         }
+}
 
-        mWater->mName = sWaterPresetName;
-        water_mgr->removeParamSet( sWaterPresetName, false );
-        water_mgr->addParamSet( sWaterPresetName, *mWater );
-        // Don't think we need to save it, the load gets the one we added above.
-        //water_mgr->savePreset( sWaterPresetName );
-        water_mgr->loadPreset( sWaterPresetName, true );
-        water_mgr->setNormalMapID( *mWaterNormal );
-
-        mSky->mName = sSkyPresetName;
-        sky_mgr->mAnimator.mIsRunning = false;
-        sky_mgr->mAnimator.mUseLindenTime = false;
-        sky_mgr->removeParamSet( sSkyPresetName, false );
-        sky_mgr->addParamSet( sSkyPresetName, *mSky );
-        // Don't think we need to save it, the load gets the one we added above.
-        //sky_mgr->savePreset( sSkyPresetName );
-        sky_mgr->loadPreset( sSkyPresetName, true );
-
-        return true;
+//static
+void LightShare::mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet)
+{
+        for(LLSD::map_const_iterator i = thisSet->mParamValues.beginMap();
+                i != thisSet->mParamValues.endMap();
+                ++i)
+        {
+                const std::string& param = i->first;
+
+                if(i->second.isArray())
+                {
+                        for (int j = 0; j < i->second.size(); j++)
+                        {
+                                oldSet->mParamValues[param][j] = i->second[j].asReal();
+                        }
+                }
+                else if(i->second.isReal())
+                  oldSet->mParamValues[param] = i->second.asReal();
+        }
 }
 
+//static
+void LightShare::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope)
+// TODO - Deal with day cycle stuff.
+{
+        LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
+        LLWLParamManager* skyMgr = LLWLParamManager::instance();
+        LLWaterParamSet oldWaterSet = waterMgr->mCurParams;
+        LLWLParamSet oldWLSet = skyMgr->mCurParams;
+        struct WLCombined* thisSet = &userSet;
+        bool user = true;
+
+        switch(scope)
+        {
+                case WL_SCOPE_USER :
+                {
+                        thisSet = &userSet;
+                        thisSet->water.mName = waterMgr->mCurParams.mName;
+                        thisSet->sky.mName = skyMgr->mCurParams.mName;
+                        thisSet->enabled = true;
+                        // Check if user selected to show the saved region or parcel settings.
+                        if (newSky && (sRegionPresetName == skyMgr->mCurParams.mName))
+                          thisSet->enabled = false;
+                        if (newWater && (sParcelPresetName == skyMgr->mCurParams.mName))
+                          thisSet->enabled = false;
+                        break;
+                }
+                case WL_SCOPE_REGION :
+                {
+                        thisSet = &regionSet;
+                        thisSet->water.mName = sRegionPresetName;
+                        thisSet->sky.mName = sRegionPresetName;
+                        thisSet->enabled = (gSavedSettings.getU32("LightShareAllowed") != LIGHTSHARE_NEVER);
+                        break;
+                }
+                case WL_SCOPE_PARCEL :
+                {
+                        thisSet = &parcelSet;
+                        thisSet->water.mName = sParcelPresetName;
+                        thisSet->sky.mName = sParcelPresetName;
+                        thisSet->enabled = (gSavedSettings.getU32("LightShareAllowed") != LIGHTSHARE_NEVER);
+                        break;
+                }
+                case WL_SCOPE_RLV :
+                {
+                        thisSet = &RLVSet;
+                        thisSet->water.mName = sRLVPresetName;
+                        thisSet->sky.mName = sRLVPresetName;
+                        // TODO set enabled properly.
+                        break;
+                }
+        }
+
+        if (newWater)
+                thisSet->water.setAll(newWater->getAll());
+        if (newWaterNormal)
+                thisSet->water.mParamValues["normalMap"] = *newWaterNormal;
+        if (newSky)
+                thisSet->sky.setAll(newSky->getAll());
 
-// static
-bool WindlightMessage::isValid()
+        if ((NULL == newWater) && (NULL == newSky))
+                thisSet->enabled = false;
+
+        F32 fade = 0; //Instant
+        bool error;
+        fade = thisSet->sky.getFloat("fade", error);
+
+        if (fade)
+        {
+                // TODO - should copy the original, then set that here.
+                // The fade should delete this copy once it's done fading.
+                // Dunno if we actually need to do any of this anyway.
+                waterMgr->removeParamSet( oldWaterSet.mName, false );
+                waterMgr->addParamSet( oldWaterSet.mName, oldWaterSet );
+                waterMgr->setNormalMapID( *newWaterNormal );
+                waterMgr->getParamSet(oldWaterSet.mName, waterMgr->mCurParams);
+                waterMgr->propagateParameters();
+
+                skyMgr->removeParamSet( oldWLSet.mName, false );
+                skyMgr->addParamSet( oldWLSet.mName, oldWLSet );
+                skyMgr->getParamSet(oldWLSet.mName, skyMgr->mCurParams);
+                skyMgr->propagateParameters();
+        }
+
+        if (regionSet.enabled)
+        {
+                waterMgr->setParamSet( regionSet.water.mName, regionSet.water );
+                skyMgr->setParamSet( regionSet.sky.mName, regionSet.sky );
+                mergeWaterSets(&(regionSet.water), &oldWaterSet);
+                mergeWLSets(&(regionSet.sky), &oldWLSet);
+        }
+        else
+        {
+                waterMgr->removeParamSet( regionSet.water.mName, false );
+                skyMgr->removeParamSet( regionSet.sky.mName, false );
+        }
+        if (parcelSet.enabled)
+        {
+                waterMgr->setParamSet( parcelSet.water.mName, parcelSet.water );
+                skyMgr->setParamSet( parcelSet.sky.mName, parcelSet.sky );
+                mergeWaterSets(&(parcelSet.water), &oldWaterSet);
+                mergeWLSets(&(parcelSet.sky), &oldWLSet);
+        }
+        else
+        {
+                waterMgr->removeParamSet( parcelSet.water.mName, false );
+                skyMgr->removeParamSet( parcelSet.sky.mName, false );
+        }
+        if (userSet.enabled)
+        {
+                mergeWaterSets(&(userSet.water), &oldWaterSet);
+                mergeWLSets(&(userSet.sky), &oldWLSet);
+        }
+        if (RLVSet.enabled)
+        {
+                mergeWaterSets(&(RLVSet.water), &oldWaterSet);
+                mergeWLSets(&(RLVSet.sky), &oldWLSet);
+        }
+
+        skyMgr->mAnimator.mIsRunning = false;
+        skyMgr->mAnimator.mUseLindenTime = false;
+        if (fade)
+        {
+                waterMgr->SetMixTime(&oldWaterSet, fade);
+                skyMgr->SetMixTime(&oldWLSet, fade);
+        }
+        else
+        {
+                if (newWater)
+                {
+                        waterMgr->setParamSet( thisSet->water.mName, oldWaterSet );
+                        waterMgr->setNormalMapID( *newWaterNormal );
+                        waterMgr->getParamSet(thisSet->water.mName, waterMgr->mCurParams);
+                        waterMgr->propagateParameters();
+                }
+
+                if (newSky)
+                {
+                          skyMgr->setParamSet( thisSet->sky.mName, oldWLSet );
+                          skyMgr->getParamSet(thisSet->sky.mName, skyMgr->mCurParams);
+                          skyMgr->propagateParameters();
+                }
+        }
+
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+}
+
+bool LightShare::isValid()
 {
         return mIsValid;
 }
 
-
-void WindlightMessage::process_packet( char* buf )
+void LightShare::process_packet( char* buf )
 {
         // *FIXME: Horrible idea, fragile, not byte-order or endian
         //         safe, no validation, etc. etc. -Jacek
         mPacket = (Meta7WindlightPacket*)buf;
 }
 
-
-void WindlightMessage::process_water()
+void LightShare::process_water()
 {
         mWater->set("waterFogColor",
                                                         mPacket->waterColor.red   / 256.f,
@@ -358,7 +490,7 @@ void WindlightMessage::process_water()
 }
 
 
-void WindlightMessage::process_sky()
+void LightShare::process_sky()
 {
         mSky->setSunAngle(F_TWO_PI * mPacket->sunMoonPosiiton);
         mSky->setEastAngle(F_TWO_PI * mPacket->eastAngle);
@@ -453,5 +585,3 @@ void WindlightMessage::process_sky()
 
         mSky->setStarBrightness(mPacket->starBrightness);
 }
-
-
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/llettherebelight.h
index 4792823..d83e827 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/llettherebelight.h
@@ -1,5 +1,5 @@
 /**
- * @file lightshare.h
+ * @file llettherebelight.h
  * @brief WindlightMessage class definition.
  *
  * Copyright (c) 2010, Jacek Antonelli
@@ -30,23 +30,34 @@
 #define LIGHTSHARE_H
 
 #include <string>
+#include "llwlparamset.h"
+#include "llwaterparamset.h"
+#include "lluuid.h"
 
 struct Meta7WindlightPacket;
-class LLMessageSystem;
-class LLSD;
-class LLTimer;
-class LLUUID;
-class LLWaterParamSet;
-class LLWLParamSet;
 
 
+typedef enum wl_scope
+{
+        WL_SCOPE_USER,
+        WL_SCOPE_REGION,
+        WL_SCOPE_PARCEL,
+        WL_SCOPE_RLV
+} WLScope;
+
+struct WLCombined
+{
+        LLWaterParamSet water;
+        LLWLParamSet sky;
+        BOOL enabled;
+};
+
 // Encapsulates a "Windlight" (LightShare) message sent from the
 // region, allowing the settings to be applied at a later time.
 //
-class WindlightMessage
+class LightShare
 {
-        public:
-
+public:
         // The meanings of the LightShareAllowed user setting.
         enum LIGHTSHARE_ALLOWED
         {
@@ -55,66 +66,54 @@ class WindlightMessage
                 LIGHTSHARE_ALWAYS = 2,
         };
 
-        // Constructs a new WindlightMessage instance from a GenericMessage
+        // The name of the preset where the region settings are stored.
+        static const std::string sRegionPresetName;
+        // The name of the preset where the parcel settings are stored.
+        static const std::string sParcelPresetName;
+        // The name of the preset where the RLV settings are stored.
+        static const std::string sRLVPresetName;
+
+        // Constructs a new LightShare instance from a GenericMessage
         // with the "Windlight" method, such as those sent by a
         // Lightshare-enabled OpenSim region.
-        WindlightMessage( LLMessageSystem* msg );
+        LightShare( LLMessageSystem* msg );
 
-        ~WindlightMessage();
-
-        // The name of the water preset where the region settings are stored.
-        static const std::string sWaterPresetName;
-
-        // The name of the sky preset where the region settings are stored.
-        static const std::string sSkyPresetName;
+        ~LightShare();
 
         // The name of the preset where the backup settings are stored.
         static const std::string sBackupWaterPresetName;
         static const std::string sBackupSkyPresetName;
 
         // Message handler for GenericMessage with the "Windlight" method.
-        // Creates and applies a new WindlightMessage (or prompts user).
+        // Creates and applies a new LightShare (or prompts user).
         static void processWindlight(LLMessageSystem* msg, void**);
 
-        // Callback when the user interacts with the notification.
-        static bool applyCallback(const LLSD& notification,
-                                  const LLSD& response);
+        static void applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisVaterNormal, LLWLParamSet* thisSky);
 
         // Called after the user has entered a new region, to reset the
         // "ignore while in this region" state.
         // Also resets/deactivates the Windlight settings in response to the "WindlightReset" method.
         static void resetRegion();
 
-        // Applies/activates the Windlight settings from the message.
-        bool apply();
-
         // Returns true if the message contains valid Windlight settings.
         // (But there's no real validation yet, so this is always true.)
         bool isValid();
 
+        static void apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope);
 
-        protected:
-
-        // Restart the timer for temporarily ignoring settings.
-        static void restartIgnoreTimer();
-
-        // Returns true if the ignore timer has expired (i.e. new settings
-        // should not be ignored anymore).
-        static bool ignoreTimerHasExpired();
-
-
-        private:
-
-        static WindlightMessage* sMostRecent;
+private:
         static LLTimer* sIgnoreTimer;
         static bool sIgnoreRegion;
 
         Meta7WindlightPacket* mPacket;
-        LLWaterParamSet* mWater;
-        LLWLParamSet* mSky;
-        LLUUID* mWaterNormal;
+        static LLWaterParamSet* mWater;
+        static LLWLParamSet* mSky;
+        static LLUUID* mWaterNormal;
         bool mIsValid;
 
+        // Callback when the user interacts with the notification.
+        static bool applyCallback(const LLSD& notification, const LLSD& response);
+
         // Converts the message's raw bytes into a Meta7WindlightPacket.
         void process_packet( char* buf );
 
@@ -124,6 +123,15 @@ class WindlightMessage
         // Constructs a LLWLParamSet from the Meta7WindlightPacket.
         void process_sky();
 
+        // Restart the timer for temporarily ignoring settings.
+        static void restartIgnoreTimer();
+
+        // Returns true if the ignore timer has expired (i.e. new settings
+        // should not be ignored anymore).
+        static bool ignoreTimerHasExpired();
+
+        static void mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet);
+        static void mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet);
 };
 
 #endif
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 8f2c6d5..ad4341c 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -233,9 +233,6 @@ void LLVolumeImplFlexible::setAttributesOfAllSections(LLVector3* inScale)
         mSection[0].mVelocity.setVec(0,0,0);
         mSection[0].mAxisRotation.setQuat(begin_rot,0,0,1);
 
-        LLVector3 parentSectionPosition = mSection[0].mPosition;
-        LLVector3 last_direction = mSection[0].mDirection;
-
         remapSections(mSection, mInitializedRes, mSection, mSimulateRes);
         mInitializedRes = mSimulateRes;
 
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 4af21b6..1016e1e 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1010,7 +1010,7 @@ void LLSpeakerMgr::update(BOOL resort_ok)
                 LLUUID speaker_id = speaker_it->first;
                 LLSpeaker* speakerp = speaker_it->second;
                 
-                speaker_map_t::iterator  cur_speaker_it = speaker_it++;
+                speaker_it++;
 
                 if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
                 {
diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
index aa89780..7c40931 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -54,6 +54,7 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
         LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon"));
         LLPipeline::setRenderScriptedBeacons(     gSavedSettings.getBOOL("scriptsbeacon"));
         LLPipeline::setRenderPhysicalBeacons(     gSavedSettings.getBOOL("physicalbeacon"));
+        LLPipeline::setRenderMOAPBeacons(                 gSavedSettings.getBOOL("moapbeacon"));
         LLPipeline::setRenderSoundBeacons(        gSavedSettings.getBOOL("soundsbeacon"));
         LLPipeline::setRenderParticleBeacons(     gSavedSettings.getBOOL("particlesbeacon"));
         LLPipeline::setRenderHighlights(          gSavedSettings.getBOOL("renderhighlights"));
@@ -67,6 +68,7 @@ BOOL LLFloaterBeacons::postBuild()
         childSetCommitCallback("physical",        onClickUICheck, this);
         childSetCommitCallback("sounds",          onClickUICheck, this);
         childSetCommitCallback("particles",       onClickUICheck, this);
+        childSetCommitCallback("moap",                    onClickUICheck, this);
         childSetCommitCallback("highlights",      onClickUICheck, this);
         childSetCommitCallback("beacons",         onClickUICheck, this);
         return TRUE;
@@ -132,6 +134,7 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
         else if(name == "physical")       LLPipeline::setRenderPhysicalBeacons(check->get());
         else if(name == "sounds")         LLPipeline::setRenderSoundBeacons(check->get());
         else if(name == "particles")      LLPipeline::setRenderParticleBeacons(check->get());
+        else if(name == "moap")           LLPipeline::setRenderMOAPBeacons(check->get());
         else if(name == "highlights")
         {
                 LLPipeline::toggleRenderHighlights(NULL);
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 8c6c5f3..b6c15b6 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -115,6 +115,9 @@ BOOL LLFloaterBuildOptions::postBuild()
         getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture")));
 
         childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getBOOL("RenderHighlightSelections") );
+        childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getBOOL("RenderHiddenSelections") );
+        childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getBOOL("RenderLightRadius") );
+        childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getBOOL("ShowSelectionBeam") );
         childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") );
         childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") );
         childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") );
@@ -293,6 +296,17 @@ void LLFloaterBuildOptions::apply()
                 LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights;
                 gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights);
         }
+        if (gSavedSettings.getBOOL("RenderHiddenSelections") != (BOOL)(childGetValue("BuildPrefsRenderHidden_toggle").asBoolean()))
+        {
+                LLSelectMgr::sRenderHiddenSelections = !LLSelectMgr::sRenderHiddenSelections;
+                gSavedSettings.setBOOL("RenderHiddenSelections", LLSelectMgr::sRenderHiddenSelections);
+        }
+        if (gSavedSettings.getBOOL("RenderLightRadius") != (BOOL)(childGetValue("BuildPrefsRenderLightRadius_toggle").asBoolean()))
+        {
+                LLSelectMgr::sRenderLightRadius = !LLSelectMgr::sRenderLightRadius;
+                gSavedSettings.setBOOL("RenderLightRadius", LLSelectMgr::sRenderLightRadius);
+        }
+        gSavedSettings.setBOOL("ShowSelectionBeam", childGetValue("BuildPrefsShowSelectionBeam_toggle").asBoolean() );
 
         gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() );
         gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() );
@@ -340,6 +354,9 @@ void LLFloaterBuildOptions::reset()
         mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString();
 
         childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() );
+        childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getControl("RenderHiddenSelections")->getDefault() );
+        childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getControl("RenderLightRadius")->getDefault() );
+        childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getControl("ShowSelectionBeam")->getDefault() );
         childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() );
         childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() );
         childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() );
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index f1749ac..5a168a5 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -364,7 +364,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
         {
                 // desaturate muted chat
                 LLColor4 muted_color = lerp(color, LLColor4::grey, 0.5f);
-                add_timestamped_line(history_editor_with_mute, chat, color);
+                add_timestamped_line(history_editor_with_mute, chat, muted_color);
         }
         
         // add objects as transient speakers that can be muted
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index 801ff49..2cb1988 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -291,21 +291,6 @@ void LLFloaterEnvSettings::onOpenWLManager(void* userData)
         WLFloaterManager::show();
 }
 
-void LLFloaterEnvSettings::onSubmitWindlight(void* userData)
-{
-        Meta7WindlightPacket * wl = new Meta7WindlightPacket();
-
-        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
-        wl->reflectionWaveletScale.X = param_mgr->mNormalScale.mX;
-        wl->reflectionWaveletScale.Y = param_mgr->mNormalScale.mY;
-        wl->reflectionWaveletScale.Z = param_mgr->mNormalScale.mZ;
-
-        
-        std::vector<std::string> strings;
-        strings.push_back((char*)wl);
-        send_generic_message("Windlight", strings);
-}
-
 void LLFloaterEnvSettings::onUseEstateTime(void* userData)
 {
         if(LLFloaterWindLight::isOpen())
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index fd39621..b96af5b 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -100,7 +100,6 @@ BOOL LLFloaterJoystick::postBuild()
         if (child)
         {
                 LLRect r = child->getRect();
-                LLRect f = getRect();
                 rect = LLRect(350, r.mTop, r.mRight + 200, 0);
         }
 
diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index 54ffc0f..ed1ec42 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -54,6 +54,7 @@
 #include "llviewerparcelmedia.h"
 #include "llcombobox.h"
 
+#include "hippogridmanager.h"
 
 // TEMP
 #include "llsdutil.h"
@@ -157,7 +158,7 @@ void LLFloaterMediaBrowser::buildURLHistory()
 
 std::string LLFloaterMediaBrowser::getSupportURL()
 {
-        return getString("support_page_url");
+        return gHippoGridManager->getConnectedGrid()->getSupportURL();
 }
 void LLFloaterMediaBrowser::onClose(bool app_quitting)
 {
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index e22de66..2bf4b31 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -393,6 +393,7 @@ BOOL	LLFloaterTools::postBuild()
         mStatusText["rotate"] = getString("status_rotate");
         mStatusText["scale"] = getString("status_scale");
         mStatusText["move"] = getString("status_move");
+        mStatusText["selectface"] = getString("status_selectface");
         mStatusText["align"] = getString("status_align");
         mStatusText["modifyland"] = getString("status_modifyland");
         mStatusText["camera"] = getString("status_camera");
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 782c56e..9dd3aab 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
  * @file llfloaterwater.cpp
  * @brief LLFloaterWater class definition
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-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
@@ -13,17 +13,17 @@
  * ("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.
@@ -62,6 +62,7 @@
 
 #include "llwaterparamset.h"
 #include "llwaterparammanager.h"
+#include "llwlparammanager.h"
 #include "llpostprocess.h"
 
 #include "wlfloaterwindlightsend.h"
@@ -75,15 +76,15 @@ std::set<std::string> LLFloaterWater::sDefaultPresets;
 LLFloaterWater::LLFloaterWater() : LLFloater(std::string("water floater"))
 {
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_water.xml");
-        
+
         // add the combo boxes
         LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
 
         if(comboBox != NULL) {
-                
-                std::map<std::string, LLWaterParamSet>::iterator mIt = 
+
+                std::map<std::string, LLWaterParamSet>::iterator mIt =
                         LLWaterParamManager::instance()->mParamList.begin();
-                for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++) 
+                for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++)
                 {
                         comboBox->add(mIt->first);
                 }
@@ -117,7 +118,7 @@ void LLFloaterWater::initCallbacks(void) {
         initHelpBtn("WaterFogColorHelp", "HelpWaterFogColor");
         initHelpBtn("WaterFogDensityHelp", "HelpWaterFogDensity");
         initHelpBtn("WaterUnderWaterFogModHelp", "HelpUnderWaterFogMod");
-        initHelpBtn("WaterGlowHelp", "HelpWaterGlow");  
+        initHelpBtn("WaterGlowHelp", "HelpWaterGlow");
         initHelpBtn("WaterNormalScaleHelp", "HelpWaterNormalScale");
         initHelpBtn("WaterFresnelScaleHelp", "HelpWaterFresnelScale");
         initHelpBtn("WaterFresnelOffsetHelp", "HelpWaterFresnelOffset");
@@ -134,7 +135,7 @@ void LLFloaterWater::initCallbacks(void) {
 
         childSetCommitCallback("WaterFogColor", onWaterFogColorMoved, &param_mgr->mFogColor);
 
-        // 
+        //
         childSetCommitCallback("WaterGlow", onColorControlAMoved, &param_mgr->mFogColor);
 
         // fog density
@@ -212,11 +213,11 @@ bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& res
 
                 // add the current parameters to the list
                 // see if it's there first
-                std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                std::map<std::string, LLWaterParamSet>::iterator mIt =
                         param_mgr->mParamList.find(text);
 
                 // if not there, add a new one
-                if(mIt == param_mgr->mParamList.end()) 
+                if(mIt == param_mgr->mParamList.end())
                 {
                         param_mgr->addParamSet(text, param_mgr->mCurParams);
                         comboBox->add(text);
@@ -227,8 +228,8 @@ bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& res
                         param_mgr->savePreset(text);
 
                 // otherwise, send a message to the user
-                } 
-                else 
+                }
+                else
                 {
                         LLNotifications::instance().add("ExistsWaterPresetAlert");
                 }
@@ -261,13 +262,13 @@ void LLFloaterWater::syncMenu()
         colCtrl->set(col);
 
         // fog and wavelets
-        param_mgr->mFogDensity.mExp = 
-                log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) / 
+        param_mgr->mFogDensity.mExp =
+                log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) /
                 log(param_mgr->mFogDensity.mBase);
         param_mgr->setDensitySliderValue(param_mgr->mFogDensity.mExp);
         childSetValue("WaterFogDensity", param_mgr->mFogDensity.mExp);
-        
-        param_mgr->mUnderWaterFogMod.mX = 
+
+        param_mgr->mUnderWaterFogMod.mX =
                 current_params.getFloat(param_mgr->mUnderWaterFogMod.mName, err);
         childSetValue("WaterUnderWaterFogMod", param_mgr->mUnderWaterFogMod.mX);
 
@@ -433,14 +434,14 @@ void LLFloaterWater::onColorControlRMoved(LLUICtrl* ctrl, void* userData)
         colorControl->mR = sldrCtrl->getValueF32();
 
         // move i if it's the max
-        if(colorControl->mR >= colorControl->mG 
-                && colorControl->mR >= colorControl->mB 
+        if(colorControl->mR >= colorControl->mG
+                && colorControl->mR >= colorControl->mB
                 && colorControl->mHasSliderName)
         {
                 colorControl->mI = colorControl->mR;
                 std::string name = colorControl->mSliderName;
                 name.append("I");
-                
+
                 sWaterMenu->childSetValue(name, colorControl->mR);
         }
 
@@ -457,7 +458,7 @@ void LLFloaterWater::onColorControlGMoved(LLUICtrl* ctrl, void* userData)
         colorControl->mG = sldrCtrl->getValueF32();
 
         // move i if it's the max
-        if(colorControl->mG >= colorControl->mR 
+        if(colorControl->mG >= colorControl->mR
                 && colorControl->mG >= colorControl->mB
                 && colorControl->mHasSliderName)
         {
@@ -517,9 +518,9 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
         WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);
 
         colorControl->mI = sldrCtrl->getValueF32();
-        
+
         // only for sliders where we pass a name
-        if(colorControl->mHasSliderName) 
+        if(colorControl->mHasSliderName)
         {
                 // set it to the top
                 F32 maxVal = std::max(std::max(colorControl->mR, colorControl->mG), colorControl->mB);
@@ -541,7 +542,7 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
                         colorControl->mR = 0;
                         colorControl->mG = 0;
                         colorControl->mB = 0;
-                
+
                 // if all at the start
                 // set them all to the intensity
                 }
@@ -597,7 +598,7 @@ void LLFloaterWater::onFloatControlMoved(LLUICtrl* ctrl, void* userData)
 void LLFloaterWater::onWaterFogColorMoved(LLUICtrl* ctrl, void* userData)
 {
         LLColorSwatchCtrl* swatch = static_cast<LLColorSwatchCtrl*>(ctrl);
-        WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);  
+        WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);
         *colorControl = swatch->get();
 
         colorControl->update(LLWaterParamManager::instance()->mCurParams);
@@ -652,7 +653,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
         }
 
         if (ctrl->getValue().asString() == "save_inventory_item")
-        {       
+        {
                 // Check if this is already a notecard.
                 if(LLWaterParamManager::instance()->mCurParams.mInventoryID.notNull())
                 {
@@ -662,13 +663,13 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
                 {
                         // Make sure we have a ".ww" extension.
                         std::string name = comboBox->getSelectedItemLabel();
-                        if(name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") != 0)
+                        if(!LLWLParamManager::isWaterSettingsNotecard(name))
                         {
                                 name += ".ww";
                         }
                         LLPointer<KVFloaterWaterNotecardCreatedCallback> cb = new KVFloaterWaterNotecardCreatedCallback();
                         // Create a notecard and then save it.
-                        create_inventory_item(gAgent.getID(), 
+                        create_inventory_item(gAgent.getID(),
                                                                   gAgent.getSessionID(),
                                                                   LLUUID::null,
                                                                   LLTransactionID::tnull,
@@ -679,7 +680,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
                                                                   NOT_WEARABLE,
                                                                   PERM_ITEM_UNRESTRICTED,
                                                                   cb);
-                        
+
                 }
         }
         else if (ctrl->getValue().asString() == "send_to_server_item")
@@ -690,13 +691,13 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
         }
         else
         {
-                LLWaterParamManager::instance()->mCurParams.mName = 
+                LLWaterParamManager::instance()->mCurParams.mName =
                         comboBox->getSelectedItemLabel();
 
                 // check to see if it's a default and shouldn't be overwritten
                 std::set<std::string>::iterator sIt = sDefaultPresets.find(
                         comboBox->getSelectedItemLabel());
-                if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets")) 
+                if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets"))
                 {
                         LLNotifications::instance().add("WLNoEditDefault");
                         return;
@@ -710,7 +711,7 @@ bool LLFloaterWater::saveNotecardCallback(const LLSD& notification, const LLSD&
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
         // if they choose save, do it.  Otherwise, don't do anything
-        if(option == 0) 
+        if(option == 0)
         {
                 LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
                 param_mgr->setParamSet(param_mgr->mCurParams.mName, param_mgr->mCurParams);
@@ -723,12 +724,12 @@ bool LLFloaterWater::saveAlertCallback(const LLSD& notification, const LLSD& res
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
         // if they choose save, do it.  Otherwise, don't do anything
-        if(option == 0) 
+        if(option == 0)
         {
                 LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
 
                 param_mgr->setParamSet(
-                        param_mgr->mCurParams.mName, 
+                        param_mgr->mCurParams.mName,
                         param_mgr->mCurParams);
 
                 // comment this back in to save to file
@@ -755,38 +756,36 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
         // if they choose delete, do it.  Otherwise, don't do anything
-        if(option == 0) 
+        if(option == 0)
         {
                 LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
                 LLFloaterDayCycle* day_cycle = NULL;
                 LLComboBox* key_combo = NULL;
-                LLMultiSliderCtrl* mult_sldr = NULL;
 
-                if(LLFloaterDayCycle::isOpen()) 
+                if(LLFloaterDayCycle::isOpen())
                 {
                         day_cycle = LLFloaterDayCycle::instance();
                         key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
-                        mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys");
                 }
 
                 std::string name = combo_box->getSelectedValue().asString();
 
                 // check to see if it's a default and shouldn't be deleted
                 std::set<std::string>::iterator sIt = sDefaultPresets.find(name);
-                if(sIt != sDefaultPresets.end()) 
+                if(sIt != sDefaultPresets.end())
                 {
                         LLNotifications::instance().add("WaterNoEditDefault");
                         return false;
                 }
 
                 LLWaterParamManager::instance()->removeParamSet(name, true);
-                
+
                 // remove and choose another
                 S32 new_index = combo_box->getCurrentIndex();
 
                 combo_box->remove(name);
 
-                if(key_combo != NULL) 
+                if(key_combo != NULL)
                 {
                         key_combo->remove(name);
 
@@ -795,12 +794,12 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
                 }
 
                 // pick the previously selected index after delete
-                if(new_index > 0) 
+                if(new_index > 0)
                 {
                         new_index--;
                 }
-                
-                if(combo_box->getItemCount() > 0) 
+
+                if(combo_box->getItemCount() > 0)
                 {
                         combo_box->setCurrentByIndex(new_index);
                 }
@@ -812,12 +811,12 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
 {
         LLComboBox * combo_box = static_cast<LLComboBox*>(ctrl);
-        
+
         if(combo_box->getSimple() == "")
         {
                 return;
         }
-        
+
         LLWaterParamManager::instance()->loadPreset(
                 combo_box->getSelectedValue().asString());
         sWaterMenu->syncMenu();
@@ -829,12 +828,12 @@ void LLFloaterWater::onClickNext(void* user_data)
         LLWaterParamSet& currentParams = param_mgr->mCurParams;
 
         // find place of current param
-        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+        std::map<std::string, LLWaterParamSet>::iterator mIt =
                 param_mgr->mParamList.find(currentParams.mName);
 
         // if at the end, loop
         std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
-        if(mIt == last) 
+        if(mIt == last)
         {
                 mIt = param_mgr->mParamList.begin();
         }
@@ -853,11 +852,11 @@ void LLFloaterWater::onClickPrev(void* user_data)
         LLWaterParamSet & currentParams = param_mgr->mCurParams;
 
         // find place of current param
-        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+        std::map<std::string, LLWaterParamSet>::iterator mIt =
                 param_mgr->mParamList.find(currentParams.mName);
 
         // if at the beginning, loop
-        if(mIt == param_mgr->mParamList.begin()) 
+        if(mIt == param_mgr->mParamList.begin())
         {
                 std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
                 mIt = last;
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 4937232..52d6e14 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -873,7 +873,7 @@ void LLFloaterWindLight::onSavePreset(LLUICtrl* ctrl, void* userData)
                 {
                         // Make sure we have a ".wl" extension.
                         std::string name = comboBox->getSelectedItemLabel();
-                        if(name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") != 0)
+                        if(!LLWLParamManager::isSkySettingsNotecard(name))
                         {
                                 name += ".wl";
                         }
@@ -973,14 +973,12 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS
                         "WLPresetsCombo");
                 LLFloaterDayCycle* day_cycle = NULL;
                 LLComboBox* key_combo = NULL;
-                LLMultiSliderCtrl* mult_sldr = NULL;
 
                 if(LLFloaterDayCycle::isOpen()) 
                 {
                         day_cycle = LLFloaterDayCycle::instance();
                         key_combo = day_cycle->getChild<LLComboBox>( 
                                 "WLKeyPresets");
-                        mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
                 }
 
                 std::string name(combo_box->getSelectedValue().asString());
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index ce2b2b4..489a5d5 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -3767,12 +3767,6 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
                 LLMenuGL::sMenuContainer->hideMenus();
         }
 
-        LLView *item = NULL;
-        if (getChildCount() > 0)
-        {
-                item = *(getChildList()->begin());
-        }
-
         switch( key )
         {
         case KEY_F2:
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index 2258bc1..f806ccc 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -565,7 +565,7 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
                                 }
                         }
                 }
-                
+
                 if(!gesture)
                 {
                         // This token doesn't match a gesture.  Pass it through to the output.
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index b4faf25..12479c1 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -546,14 +546,15 @@ void LLHoverView::updateText()
 
                 LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
                 LLUUID owner;
-                S32 width = 0;
-                S32 height = 0;
+                // Their use is commented out below.  No doubt both will get deleted on a later clean up pass.
+                //S32 width = 0;
+                //S32 height = 0;
 
                 if ( hover_parcel )
                 {
                         owner = hover_parcel->getOwnerID();
-                        width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
-                        height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
+                //      width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
+                //      height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
                 }
 
                 // Line: "Land"
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index eb2170a..6e6b39c 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1439,7 +1439,6 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
         if(drop && accept)
         {
                 it = inventory_objects.begin();
-                InventoryObjectList::iterator first_it = inventory_objects.begin();
                 LLMoveInv* move_inv = new LLMoveInv;
                 move_inv->mObjectID = object_id;
                 move_inv->mCategoryID = category_id;
@@ -1922,24 +1921,11 @@ void LLFolderBridge::pasteFromClipboard()
                         item = model->getItem(objects.get(i));
                         if (item)
                         {
-                                copy_inventory_item(
-                                        gAgent.getID(),
-                                        item->getPermissions().getOwner(),
-                                        item->getUUID(),
-                                        parent_id,
-                                        std::string(),
-                                        LLPointer<LLInventoryCallback>(NULL));
-                                LLInventoryCategory* cat = model->getCategory(item->getUUID());
-                                if(cat)
-                                {
-                                        model->purgeDescendentsOf(mUUID);
-                                }
-                                LLInventoryObject* obj = model->getObject(item->getUUID());
-                                if(!obj) return;
-                                obj->removeFromServer();
-                                LLPreview::hide(item->getUUID());
-                                model->deleteObject(item->getUUID());
-                                model->notifyObservers();
+                                LLInvFVBridge::changeItemParent(
+                                        model,
+                                        (LLViewerInventoryItem*)item,
+                                        mUUID,
+                                        FALSE);
                         }
                 }
         }
@@ -3123,11 +3109,11 @@ void LLNotecardBridge::openItem()
         LLViewerInventoryItem* item = getItem();
         if (item)
         {
-                if(isSkySetting())
+                if(LLWLParamManager::isSkySettingsNotecard(getName()))
                 {
                         LLWLParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID);
                 }
-                else if(isWaterSetting())
+                else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
                 {
                         LLWaterParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID);
                 }
@@ -3158,13 +3144,13 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
         else
         {
 
-                if(isWindLight())
+                if(LLWLParamManager::isSettingsNotecard(getName()))
                 {
-                        if(isSkySetting())
+                        if(LLWLParamManager::isSkySettingsNotecard(getName()))
                         {
                                 items.push_back(std::string("Use WindLight Settings"));
                         }
-                        else if(isWaterSetting())
+                        else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
                         {
                                 items.push_back(std::string("Use WaterLight Settings"));
                         }
@@ -3221,11 +3207,11 @@ void LLNotecardBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
 
 LLUIImagePtr LLNotecardBridge::getIcon() const
 {
-        if(isSkySetting())
+        if(LLWLParamManager::isSkySettingsNotecard(getName()))
         {
                 return LLUI::getUIImage("Inv_WindLight");
         }
-        else if(isWaterSetting())
+        else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
         {
                 return LLUI::getUIImage("Inv_WaterLight");
         }
@@ -3235,20 +3221,6 @@ LLUIImagePtr LLNotecardBridge::getIcon() const
         }
 }
 
-bool LLNotecardBridge::isSkySetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
-}
-
-bool LLNotecardBridge::isWaterSetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".ww") == 0);
-}
-
-bool LLNotecardBridge::isWindLight() const
-{
-        return (isSkySetting() || isWaterSetting());
-}
 
 // +=================================================+
 // |        LLGestureBridge                          |
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 5a53aa5..0318e6c 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -511,9 +511,6 @@ public:
         virtual const std::string& getPrefix() { return sPrefix; }
 
         virtual LLUIImagePtr getIcon() const;
-        bool isSkySetting() const;
-        bool isWaterSetting() const;
-        bool isWindLight() const;
         virtual void openItem();
         virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
         virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 3f74965..8b98782 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -455,8 +455,6 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                                                                                    void (*callback)(const LLSD&, void*),
                                                                                    void* user_data)
 {
-        llassert_always(NULL != callback);
-
         LLUUID id;
 
         if(!isInventoryUsable())
@@ -464,7 +462,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                 llwarns << "Inventory is broken." << llendl;
                 LLSD result;
                 result["failure"] = true;
-                callback(result, user_data);
+                if (callback)
+                    callback(result, user_data);
         }
 
 
@@ -473,7 +472,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                 LL_DEBUGS("Inventory") << "Attempt to create simstate category." << LL_ENDL;
                 LLSD result;
                 result["failure"] = true;
-                callback(result, user_data);
+                if (callback)
+                    callback(result, user_data);
         }
 
         id.generate();
@@ -492,10 +492,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                 name.assign(NEW_CATEGORY_NAME);
         }
 
-        if (user_data)  // callback required for acked message.
+        if ((NULL != callback) && (NULL != user_data))  // callback required for acked message.
         {
-
-
                 LLViewerRegion* viewer_region = gAgent.getRegion();
 
                 if (!viewer_region->capabilitiesReceived())
@@ -537,7 +535,10 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
         {
                 // user_data is a LLCategoryCreate object instantiated in the calling
                 // function - bug (or low memory - any leaks?).
-                llwarns << "NULL user_data" << llendl;
+                // Or, it might just be no problem, since passing the callback in the first place is optional.
+                // It's really up to the calling function to know what it passed to pass back to the callback.
+                if (callback)
+                    llwarns << "NULL user_data" << llendl;
         }
 
         // Add the category to the internal representation
@@ -1211,7 +1212,6 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
         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?
         for(S32 i = 0; i < count; ++i)
@@ -1244,10 +1244,6 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
                 {
                         folder_id = titem->getParentUUID();
                 }
-                else
-                {
-                        all_one_folder = false;
-                }
         }
 
         U32 changes = 0x0;
@@ -2960,7 +2956,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
         item_array_t items;
         update_map_t update;
         S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
-        bool all_one_folder = true;
         LLUUID folder_id;
         // Does this loop ever execute more than once?
         for(S32 i = 0; i < count; ++i)
@@ -2992,10 +2987,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
                 {
                         folder_id = titem->getParentUUID();
                 }
-                else
-                {
-                        all_one_folder = false;
-                }
         }
         if(account)
         {
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 77c8bd5..fa5ab56 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -1652,7 +1652,6 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
                 return;
         }
         
-        LLQuaternion object_rot = first_object->getRenderRotation();
         LLVector3 rotation_center = gAgent.getPosAgentFromGlobal(mRotationCenter);
         LLVector3 mouse_dir_x;
         LLVector3 mouse_dir_y;
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index fe6bc26..f69dca4 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -1172,9 +1172,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
                 mInSnapRegime = FALSE;
         }
 
-        BOOL send_scale_update = FALSE;
-        BOOL send_position_update = FALSE;
-
         LLVector3 dir_agent;
         if( part_dir_local.mV[VX] )
         {
@@ -1191,8 +1188,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
         stretchFace( 
                 projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent,
                 projected_vec(drag_delta, dir_agent));
-        send_position_update = TRUE;
-        send_scale_update = TRUE;
 
         mDragPointGlobal = drag_point_global;
 }
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 7a7233e..b79c1a9 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -487,9 +487,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                 }
         }
 
-        // Throttle updates to 10 per second.
-        BOOL send_update = FALSE;
-
         LLVector3               axis_f;
         LLVector3d              axis_d;
 
@@ -701,10 +698,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                 LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
 
                                 // move and clamp root object first, before adjusting children
-                                if (new_position_local != old_position_local)
-                                {
-                                        send_update = TRUE;
-                                }
+
                                 //RN: I forget, but we need to do this because of snapping which doesn't often result
                                 // in position changes even when the mouse moves
                                 object->setPosition(new_position_local);
@@ -714,8 +708,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 
                                 if (selectNode->mIndividualSelection)
                                 {
-                                        send_update = FALSE;
-                
                                         // counter-translate child objects if we are moving the root as an individual
                                         object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ;                                  
                                 }
@@ -752,7 +744,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                 }
 
                                 // PR: Only update if changed
-                                LLVector3d old_position_global = object->getPositionGlobal();
                                 LLVector3 old_position_agent = object->getPositionAgent();
                                 LLVector3 new_position_agent = gAgent.getPosAgentFromGlobal(new_position_global);
                                 if (object->isRootEdit())
@@ -774,11 +765,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                 {
                                         // counter-translate child objects if we are moving the root as an individual
                                         object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ;                                  
-                                        send_update = FALSE;
-                                }
-                                else if (old_position_global != new_position_global)
-                                {
-                                        send_update = TRUE;
                                 }
                         }
                         selectNode->mLastPositionLocal  = object->getPosition();
@@ -1302,7 +1288,7 @@ void LLManipTranslate::renderSnapGuides()
                                         // add in off-axis offset
                                         tick_start += (mSnapOffsetAxis * mSnapOffsetMeters);
 
-                                        BOOL is_sub_tick = FALSE;
+//                                      BOOL is_sub_tick = FALSE;
                                         F32 tick_scale = 1.f;
                                         for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f)
                                         {
@@ -1311,7 +1297,7 @@ void LLManipTranslate::renderSnapGuides()
                                                         break;
                                                 }
                                                 tick_scale *= 0.7f;
-                                                is_sub_tick = TRUE;
+//                                              is_sub_tick = TRUE;
                                         }
 
 //                                      S32 num_ticks_to_fade = is_sub_tick ? num_ticks_per_side / 2 : num_ticks_per_side;
@@ -1533,7 +1519,6 @@ void LLManipTranslate::renderSnapGuides()
                 
                 float a = line_alpha;
 
-                LLColor4 col = gColors.getColor("SilhouetteChildColor");
                 {
                         //draw grid behind objects
                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
diff --git a/linden/indra/newview/llmediadataclient.cpp b/linden/indra/newview/llmediadataclient.cpp
new file mode 100644
index 0000000..e2fa700
--- /dev/null
+++ b/linden/indra/newview/llmediadataclient.cpp
@@ -0,0 +1,813 @@
+/** 
+ * @file llmediadataclient.cpp
+ * @brief class for queueing up requests for media data
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2010, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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$
+ * 
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llmediadataclient.h"
+
+#if LL_MSVC
+// disable boost::lexical_cast warning
+#pragma warning (disable:4702)
+#endif
+
+#include <boost/lexical_cast.hpp>
+
+#include "llhttpstatuscodes.h"
+#include "llsdutil.h"
+#include "llmediaentry.h"
+#include "lltextureentry.h"
+#include "llviewerregion.h"
+
+//
+// When making a request
+// - obtain the "overall interest score" of the object.  
+//       This would be the sum of the impls' interest scores.
+// - put the request onto a queue sorted by this score 
+//       (highest score at the front of the queue)
+// - On a timer, once a second, pull off the head of the queue and send 
+//       the request.
+// - Any request that gets a 503 still goes through the retry logic
+//
+
+//
+// Forward decls
+//
+const F32 LLMediaDataClient::QUEUE_TIMER_DELAY = 1.0; // seconds(s)
+const F32 LLMediaDataClient::UNAVAILABLE_RETRY_TIMER_DELAY = 10.0; // secs
+const U32 LLMediaDataClient::MAX_RETRIES = 10;
+const U32 LLMediaDataClient::MAX_SORTED_QUEUE_SIZE = 10000;
+const U32 LLMediaDataClient::MAX_ROUND_ROBIN_QUEUE_SIZE = 10000;
+
+// << operators
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::request_queue_t &q);
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::Request &q);
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::LLMediaDataClient(F32 queue_timer_delay,
+                                                                         F32 retry_timer_delay,
+                                                                         U32 max_retries,
+                                                                         U32 max_sorted_queue_size,
+                                                                         U32 max_round_robin_queue_size)
+        : mQueueTimerDelay(queue_timer_delay),
+          mRetryTimerDelay(retry_timer_delay),
+          mMaxNumRetries(max_retries),
+          mMaxSortedQueueSize(max_sorted_queue_size),
+          mMaxRoundRobinQueueSize(max_round_robin_queue_size),
+          mQueueTimerIsRunning(false),
+          mCurrentQueueIsTheSortedQueue(true)
+{
+}
+
+LLMediaDataClient::~LLMediaDataClient()
+{
+        stopQueueTimer();
+
+        // This should clear the queue, and hopefully call all the destructors.
+        LL_DEBUGS("LLMediaDataClient") << "~LLMediaDataClient destructor: queue: " << 
+                (isEmpty() ? "<empty> " : "<not empty> ") << LL_ENDL;
+        
+        mSortedQueue.clear();
+        mRoundRobinQueue.clear();
+}
+
+bool LLMediaDataClient::isEmpty() const
+{
+        return mSortedQueue.empty() && mRoundRobinQueue.empty();
+}
+
+bool LLMediaDataClient::isInQueue(const LLMediaDataClientObject::ptr_t &object)
+{
+        return (LLMediaDataClient::findOrRemove(mSortedQueue, object, false/*remove*/, LLMediaDataClient::Request::ANY).notNull()
+                || (LLMediaDataClient::findOrRemove(mRoundRobinQueue, object, false/*remove*/, LLMediaDataClient::Request::ANY).notNull()));
+}
+
+bool LLMediaDataClient::removeFromQueue(const LLMediaDataClientObject::ptr_t &object)
+{
+        bool removedFromSortedQueue = LLMediaDataClient::findOrRemove(mSortedQueue, object, true/*remove*/, LLMediaDataClient::Request::ANY).notNull();
+        bool removedFromRoundRobinQueue = LLMediaDataClient::findOrRemove(mRoundRobinQueue, object, true/*remove*/, LLMediaDataClient::Request::ANY).notNull();
+        return removedFromSortedQueue || removedFromRoundRobinQueue;
+}
+
+//static
+LLMediaDataClient::request_ptr_t LLMediaDataClient::findOrRemove(request_queue_t &queue, const LLMediaDataClientObject::ptr_t &obj, bool remove, LLMediaDataClient::Request::Type type)
+{
+        request_ptr_t result;
+        request_queue_t::iterator iter = queue.begin();
+        request_queue_t::iterator end = queue.end();
+        while (iter != end)
+        {
+                if (obj->getID() == (*iter)->getObject()->getID() && (type == LLMediaDataClient::Request::ANY || type == (*iter)->getType()))
+                {
+                        result = *iter;
+                        if (remove) queue.erase(iter);
+                        break;
+                }
+                iter++;
+        }
+        return result;
+}
+
+void LLMediaDataClient::request(const LLMediaDataClientObject::ptr_t &object, const LLSD &payload)
+{
+        if (object.isNull() || ! object->hasMedia()) return; 
+        
+        // Push the object on the queue
+        enqueue(new Request(getCapabilityName(), payload, object, this));
+}
+
+void LLMediaDataClient::enqueue(const Request *request)
+{
+        if (request->isNew())
+        {               
+                // Add to sorted queue
+                if (LLMediaDataClient::findOrRemove(mSortedQueue, request->getObject(), true/*remove*/, request->getType()).notNull())
+                {
+                        LL_DEBUGS("LLMediaDataClient") << "REMOVING OLD request for " << *request << " ALREADY THERE!" << LL_ENDL;
+                }
+                
+                LL_DEBUGS("LLMediaDataClient") << "Queuing SORTED request for " << *request << LL_ENDL;
+                
+                // Sadly, we have to const-cast because items put into the queue are not const
+                mSortedQueue.push_back(const_cast<LLMediaDataClient::Request*>(request));
+                
+                LL_DEBUGS("LLMediaDataClientQueue") << "SORTED queue:" << mSortedQueue << LL_ENDL;
+        }
+        else {
+                if (mRoundRobinQueue.size() > mMaxRoundRobinQueueSize) 
+                {
+                        LL_INFOS_ONCE("LLMediaDataClient") << "RR QUEUE MAXED OUT!!!" << LL_ENDL;
+                        LL_DEBUGS("LLMediaDataClient") << "Not queuing " << *request << LL_ENDL;
+                        return;
+                }
+                                
+                // ROUND ROBIN: if it is there, and it is a GET request, leave it.  If not, put at front!               
+                request_ptr_t existing_request;
+                if (request->getType() == Request::GET)
+                {
+                        existing_request = LLMediaDataClient::findOrRemove(mRoundRobinQueue, request->getObject(), false/*remove*/, request->getType());
+                }
+                if (existing_request.isNull())
+                {
+                        LL_DEBUGS("LLMediaDataClient") << "Queuing RR request for " << *request << LL_ENDL;
+                        // Push the request on the pending queue
+                        // Sadly, we have to const-cast because items put into the queue are not const
+                        mRoundRobinQueue.push_front(const_cast<LLMediaDataClient::Request*>(request));
+                        
+                        LL_DEBUGS("LLMediaDataClientQueue") << "RR queue:" << mRoundRobinQueue << LL_ENDL;                      
+                }
+                else
+                {
+                        LL_DEBUGS("LLMediaDataClient") << "ALREADY THERE: NOT Queuing request for " << *request << LL_ENDL;
+                                                
+                        existing_request->markSent(false);
+                }
+        }       
+        // Start the timer if not already running
+        startQueueTimer();
+}
+
+void LLMediaDataClient::startQueueTimer() 
+{
+        if (! mQueueTimerIsRunning)
+        {
+                LL_DEBUGS("LLMediaDataClient") << "starting queue timer (delay=" << mQueueTimerDelay << " seconds)" << LL_ENDL;
+                // LLEventTimer automagically takes care of the lifetime of this object
+                new QueueTimer(mQueueTimerDelay, this);
+        }
+        else { 
+                LL_DEBUGS("LLMediaDataClient") << "not starting queue timer (it's already running, right???)" << LL_ENDL;
+        }
+}
+
+void LLMediaDataClient::stopQueueTimer()
+{
+        mQueueTimerIsRunning = false;
+}
+
+bool LLMediaDataClient::processQueueTimer()
+{
+        sortQueue();
+        
+        if(!isEmpty())
+        {
+                LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() started, SORTED queue size is:      " << mSortedQueue.size() 
+                        << ", RR queue size is:   " << mRoundRobinQueue.size() << LL_ENDL;
+                LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() started, SORTED queue is:      " << mSortedQueue << LL_ENDL;
+                LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() started, RR queue is:          " << mRoundRobinQueue << LL_ENDL;
+        }
+        
+        serviceQueue();
+        
+        LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() finished, SORTED queue size is:     " << mSortedQueue.size() 
+                << ", RR queue size is:   " << mRoundRobinQueue.size() << LL_ENDL;
+        LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() finished, SORTED queue is:     " << mSortedQueue << LL_ENDL;
+        LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() finished, RR queue is:         " << mRoundRobinQueue << LL_ENDL;
+        
+        return isEmpty();
+}
+
+void LLMediaDataClient::sortQueue()
+{
+        if(!mSortedQueue.empty())
+        {
+                // Score all items first
+                request_queue_t::iterator iter = mSortedQueue.begin();
+                request_queue_t::iterator end = mSortedQueue.end();
+                while (iter != end)
+                {
+                        (*iter)->updateScore();
+                        iter++;
+                }
+                
+                // Re-sort the list...
+                // NOTE: should this be a stable_sort?  If so we need to change to using a vector.
+                mSortedQueue.sort(LLMediaDataClient::compareRequests);
+                
+                // ...then cull items over the max
+                U32 size = mSortedQueue.size();
+                if (size > mMaxSortedQueueSize) 
+                {
+                        U32 num_to_cull = (size - mMaxSortedQueueSize);
+                        LL_INFOS_ONCE("LLMediaDataClient") << "sorted queue MAXED OUT!  Culling " 
+                                << num_to_cull << " items" << LL_ENDL;
+                        while (num_to_cull-- > 0)
+                        {
+                                mSortedQueue.pop_back();
+                        }
+                }
+        }
+}
+
+// static
+bool LLMediaDataClient::compareRequests(const request_ptr_t &o1, const request_ptr_t &o2)
+{
+        if (o2.isNull()) return true;
+        if (o1.isNull()) return false;
+        return ( o1->getScore() > o2->getScore() );
+}
+
+void LLMediaDataClient::serviceQueue()
+{       
+        request_queue_t *queue_p = getCurrentQueue();
+        
+        // quick retry loop for cases where we shouldn't wait for the next timer tick
+        while(true)
+        {
+                if (queue_p->empty())
+                {
+                        LL_DEBUGS("LLMediaDataClient") << "queue empty: " << (*queue_p) << LL_ENDL;
+                        break;
+                }
+                
+                // Peel one off of the items from the queue, and execute request
+                request_ptr_t request = queue_p->front();
+                llassert(!request.isNull());
+                const LLMediaDataClientObject *object = (request.isNull()) ? NULL : request->getObject();
+                llassert(NULL != object);
+                
+                // Check for conditions that would make us just pop and rapidly loop through
+                // the queue.
+                if(request.isNull() ||
+                   request->isMarkedSent() ||
+                   NULL == object ||
+                   object->isDead() ||
+                   !object->hasMedia())
+                {
+                        if (request.isNull()) 
+                        {
+                                LL_WARNS("LLMediaDataClient") << "Skipping NULL request" << LL_ENDL;
+                        }
+                        else {
+                                LL_INFOS("LLMediaDataClient") << "Skipping : " << *request << " " 
+                                << ((request->isMarkedSent()) ? " request is marked sent" :
+                                        ((NULL == object) ? " object is NULL " :
+                                         ((object->isDead()) ? "object is dead" : 
+                                          ((!object->hasMedia()) ? "object has no media!" : "BADNESS!")))) << LL_ENDL;
+                        }
+                        queue_p->pop_front();
+                        continue;       // jump back to the start of the quick retry loop
+                }
+                
+                // Next, ask if this is "interesting enough" to fetch.  If not, just stop
+                // and wait for the next timer go-round.  Only do this for the sorted 
+                // queue.
+                if (mCurrentQueueIsTheSortedQueue && !object->isInterestingEnough())
+                {
+                        LL_DEBUGS("LLMediaDataClient") << "Not fetching " << *request << ": not interesting enough" << LL_ENDL;
+                        break;
+                }
+                
+                // Finally, try to send the HTTP message to the cap url
+                std::string url = request->getCapability();
+                bool maybe_retry = false;
+                if (!url.empty())
+                {
+                        const LLSD &sd_payload = request->getPayload();
+                        LL_INFOS("LLMediaDataClient") << "Sending request for " << *request << LL_ENDL;
+                        
+                        // Call the subclass for creating the responder
+                        LLHTTPClient::post(url, sd_payload, createResponder(request));
+                }
+                else {
+                        LL_INFOS("LLMediaDataClient") << "NOT Sending request for " << *request << ": empty cap url!" << LL_ENDL;
+                        maybe_retry = true;
+                }
+
+                bool exceeded_retries = request->getRetryCount() > mMaxNumRetries;
+                if (maybe_retry && ! exceeded_retries) // Try N times before giving up 
+                {
+                        // We got an empty cap, but in that case we will retry again next
+                        // timer fire.
+                        request->incRetryCount();
+                }
+                else {
+                        if (exceeded_retries)
+                        {
+                                LL_WARNS("LLMediaDataClient") << "Could not send request " << *request << " for " 
+                                        << mMaxNumRetries << " tries...popping object id " << object->getID() << LL_ENDL; 
+                                // XXX Should we bring up a warning dialog??
+                        }
+                        
+                        queue_p->pop_front();
+                        
+                        if (! mCurrentQueueIsTheSortedQueue) {
+                                // Round robin
+                                request->markSent(true);
+                                mRoundRobinQueue.push_back(request);                            
+                        }
+                }
+                
+                // end of quick loop -- any cases where we want to loop will use 'continue' to jump back to the start.
+                break;
+        }
+        
+        swapCurrentQueue();
+}
+
+void LLMediaDataClient::swapCurrentQueue()
+{
+        // Swap
+        mCurrentQueueIsTheSortedQueue = !mCurrentQueueIsTheSortedQueue;
+        // If its empty, swap back
+        if (getCurrentQueue()->empty()) 
+        {
+                mCurrentQueueIsTheSortedQueue = !mCurrentQueueIsTheSortedQueue;
+        }
+}
+
+LLMediaDataClient::request_queue_t *LLMediaDataClient::getCurrentQueue()
+{
+        return (mCurrentQueueIsTheSortedQueue) ? &mSortedQueue : &mRoundRobinQueue;
+}
+
+// dump the queue
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::request_queue_t &q)
+{
+        int i = 0;
+        LLMediaDataClient::request_queue_t::const_iterator iter = q.begin();
+        LLMediaDataClient::request_queue_t::const_iterator end = q.end();
+        while (iter != end)
+        {
+                s << "\t" << i << "]: " << (*iter)->getObject()->getID().asString() << "(" << (*iter)->getObject()->getMediaInterest() << ")";
+                iter++;
+                i++;
+        }
+        return s;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::QueueTimer
+// Queue of LLMediaDataClientObject smart pointers to request media for.
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::QueueTimer::QueueTimer(F32 time, LLMediaDataClient *mdc)
+: LLEventTimer(time), mMDC(mdc)
+{
+        mMDC->setIsRunning(true);
+}
+
+LLMediaDataClient::QueueTimer::~QueueTimer()
+{
+        LL_DEBUGS("LLMediaDataClient") << "~QueueTimer" << LL_ENDL;
+        mMDC->setIsRunning(false);
+        mMDC = NULL;
+}
+
+// virtual
+BOOL LLMediaDataClient::QueueTimer::tick()
+{
+        if (mMDC.isNull()) return TRUE;
+        return mMDC->processQueueTimer();
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::Responder::RetryTimer
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::Responder::RetryTimer::RetryTimer(F32 time, Responder *mdr)
+: LLEventTimer(time), mResponder(mdr)
+{
+}
+
+// virtual 
+LLMediaDataClient::Responder::RetryTimer::~RetryTimer() 
+{
+        LL_DEBUGS("LLMediaDataClient") << "~RetryTimer" << *(mResponder->getRequest()) << LL_ENDL;
+        
+        // XXX This is weird: Instead of doing the work in tick()  (which re-schedules
+        // a timer, which might be risky), do it here, in the destructor.  Yes, it is very odd.
+        // Instead of retrying, we just put the request back onto the queue
+        LL_INFOS("LLMediaDataClient") << "RetryTimer fired for: " << *(mResponder->getRequest()) << " retrying" << LL_ENDL;
+        mResponder->getRequest()->reEnqueue();
+        
+        // Release the ref to the responder.
+        mResponder = NULL;
+}
+
+// virtual
+BOOL LLMediaDataClient::Responder::RetryTimer::tick()
+{
+        // Don't fire again
+        return TRUE;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::Request
+//
+//////////////////////////////////////////////////////////////////////////////////////
+/*static*/U32 LLMediaDataClient::Request::sNum = 0;
+
+LLMediaDataClient::Request::Request(const char *cap_name, 
+                                                                        const LLSD& sd_payload,
+                                                                        LLMediaDataClientObject *obj, 
+                                                                        LLMediaDataClient *mdc)
+: mCapName(cap_name), 
+  mPayload(sd_payload), 
+  mObject(obj),
+  mNum(++sNum), 
+  mRetryCount(0),
+  mMDC(mdc),
+  mMarkedSent(false),
+  mScore((F64)0.0)
+{
+}
+
+LLMediaDataClient::Request::~Request()
+{
+        LL_DEBUGS("LLMediaDataClient") << "~Request" << (*this) << LL_ENDL;
+        mMDC = NULL;
+        mObject = NULL;
+}
+
+
+std::string LLMediaDataClient::Request::getCapability() const
+{
+        return getObject()->getCapabilityUrl(getCapName());
+}
+
+// Helper function to get the "type" of request, which just pokes around to
+// discover it.
+LLMediaDataClient::Request::Type LLMediaDataClient::Request::getType() const
+{
+        if (0 == strcmp(mCapName, "ObjectMediaNavigate"))
+        {
+                return NAVIGATE;
+        }
+        else if (0 == strcmp(mCapName, "ObjectMedia"))
+        {
+                const std::string &verb = mPayload["verb"];
+                if (verb == "GET")
+                {
+                        return GET;
+                }
+                else if (verb == "UPDATE")
+                {
+                        return UPDATE;
+                }
+        }
+        llassert(false);
+        return GET;
+}
+
+const char *LLMediaDataClient::Request::getTypeAsString() const
+{
+        Type t = getType();
+        switch (t)
+        {
+                case GET:
+                        return "GET";
+                        break;
+                case UPDATE:
+                        return "UPDATE";
+                        break;
+                case NAVIGATE:
+                        return "NAVIGATE";
+                        break;
+                case ANY:
+                        return "ANY";
+                        break;
+        }
+        return "";
+}
+
+
+void LLMediaDataClient::Request::reEnqueue() const
+{
+        // I sure hope this doesn't deref a bad pointer:
+        mMDC->enqueue(this);
+}
+
+F32 LLMediaDataClient::Request::getRetryTimerDelay() const
+{
+        return (mMDC == NULL) ? LLMediaDataClient::UNAVAILABLE_RETRY_TIMER_DELAY :
+        mMDC->mRetryTimerDelay; 
+}
+
+U32 LLMediaDataClient::Request::getMaxNumRetries() const
+{
+        return (mMDC == NULL) ? LLMediaDataClient::MAX_RETRIES : mMDC->mMaxNumRetries;
+}
+
+void LLMediaDataClient::Request::markSent(bool flag)
+{
+         if (mMarkedSent != flag)
+         {
+                 mMarkedSent = flag;
+                 if (!mMarkedSent)
+                 {
+                         mNum = ++sNum;
+                 }
+         }
+}
+                   
+void LLMediaDataClient::Request::updateScore()
+{                               
+        F64 tmp = mObject->getMediaInterest();
+        if (tmp != mScore)
+        {
+                LL_DEBUGS("LLMediaDataClient") << "Score for " << mObject->getID() << " changed from " << mScore << " to " << tmp << LL_ENDL; 
+                mScore = tmp;
+        }
+}
+                   
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::Request &r)
+{
+        s << "request: num=" << r.getNum() 
+        << " type=" << r.getTypeAsString() 
+        << " ID=" << r.getObject()->getID() 
+        << " #retries=" << r.getRetryCount();
+        return s;
+}
+
+                        
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::Responder
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::Responder::Responder(const request_ptr_t &request)
+: mRequest(request)
+{
+}
+
+LLMediaDataClient::Responder::~Responder()
+{
+        LL_DEBUGS("LLMediaDataClient") << "~Responder" << *(getRequest()) << LL_ENDL;
+        mRequest = NULL;
+}
+
+/*virtual*/
+void LLMediaDataClient::Responder::error(U32 status, const std::string& reason)
+{
+        if (status == HTTP_SERVICE_UNAVAILABLE)
+        {
+                F32 retry_timeout = mRequest->getRetryTimerDelay();
+                
+                mRequest->incRetryCount();
+                
+                if (mRequest->getRetryCount() < mRequest->getMaxNumRetries()) 
+                {
+                        LL_INFOS("LLMediaDataClient") << *mRequest << " got SERVICE_UNAVAILABLE...retrying in " << retry_timeout << " seconds" << LL_ENDL;
+                        
+                        // Start timer (instances are automagically tracked by
+                        // InstanceTracker<> and LLEventTimer)
+                        new RetryTimer(F32(retry_timeout/*secs*/), this);
+                }
+                else {
+                        LL_INFOS("LLMediaDataClient") << *mRequest << " got SERVICE_UNAVAILABLE...retry count " 
+                                << mRequest->getRetryCount() << " exceeds " << mRequest->getMaxNumRetries() << ", not retrying" << LL_ENDL;
+                }
+        }
+        else {
+                std::string msg = boost::lexical_cast<std::string>(status) + ": " + reason;
+                LL_WARNS("LLMediaDataClient") << *mRequest << " http error(" << msg << ")" << LL_ENDL;
+        }
+}
+
+/*virtual*/
+void LLMediaDataClient::Responder::result(const LLSD& content)
+{
+        LL_DEBUGS("LLMediaDataClientResponse") << *mRequest << " result : " << ll_print_sd(content) << LL_ENDL;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLObjectMediaDataClient
+// Subclass of LLMediaDataClient for the ObjectMedia cap
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::Responder *LLObjectMediaDataClient::createResponder(const request_ptr_t &request) const
+{
+        return new LLObjectMediaDataClient::Responder(request);
+}
+
+const char *LLObjectMediaDataClient::getCapabilityName() const 
+{
+        return "ObjectMedia";
+}
+
+void LLObjectMediaDataClient::fetchMedia(LLMediaDataClientObject *object)
+{
+        LLSD sd_payload;
+        sd_payload["verb"] = "GET";
+        sd_payload[LLTextureEntry::OBJECT_ID_KEY] = object->getID();
+        request(object, sd_payload);
+}
+
+void LLObjectMediaDataClient::updateMedia(LLMediaDataClientObject *object)
+{
+        LLSD sd_payload;
+        sd_payload["verb"] = "UPDATE";
+        sd_payload[LLTextureEntry::OBJECT_ID_KEY] = object->getID();
+        LLSD object_media_data;
+        int i = 0;
+        int end = object->getMediaDataCount();
+        for ( ; i < end ; ++i) 
+        {
+                object_media_data.append(object->getMediaDataLLSD(i));
+        }
+        sd_payload[LLTextureEntry::OBJECT_MEDIA_DATA_KEY] = object_media_data;
+                
+        LL_DEBUGS("LLMediaDataClient") << "update media data: " << object->getID() << " " << ll_print_sd(sd_payload) << LL_ENDL;
+        
+        request(object, sd_payload);
+}
+
+/*virtual*/
+void LLObjectMediaDataClient::Responder::result(const LLSD& content)
+{
+        const LLMediaDataClient::Request::Type type = getRequest()->getType();
+        llassert(type == LLMediaDataClient::Request::GET || type == LLMediaDataClient::Request::UPDATE)
+        if (type == LLMediaDataClient::Request::GET)
+        {
+                LL_DEBUGS("LLMediaDataClientResponse") << *(getRequest()) << " GET returned: " << ll_print_sd(content) << LL_ENDL;
+                
+                // Look for an error
+                if (content.has("error"))
+                {
+                        const LLSD &error = content["error"];
+                        LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Error getting media data for object: code=" << 
+                                error["code"].asString() << ": " << error["message"].asString() << LL_ENDL;
+                        
+                        // XXX Warn user?
+                }
+                else {
+                        // Check the data
+                        const LLUUID &object_id = content[LLTextureEntry::OBJECT_ID_KEY];
+                        if (object_id != getRequest()->getObject()->getID()) 
+                        {
+                                // NOT good, wrong object id!!
+                                LL_WARNS("LLMediaDataClient") << *(getRequest()) << " DROPPING response with wrong object id (" << object_id << ")" << LL_ENDL;
+                                return;
+                        }
+                        
+                        // Otherwise, update with object media data
+                        getRequest()->getObject()->updateObjectMediaData(content[LLTextureEntry::OBJECT_MEDIA_DATA_KEY],
+                                                                                                                         content[LLTextureEntry::MEDIA_VERSION_KEY]);
+                }
+        }
+        else if (type == LLMediaDataClient::Request::UPDATE)
+        {
+                // just do what our superclass does
+                LLMediaDataClient::Responder::result(content);
+        }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLObjectMediaNavigateClient
+// Subclass of LLMediaDataClient for the ObjectMediaNavigate cap
+//
+//////////////////////////////////////////////////////////////////////////////////////
+LLMediaDataClient::Responder *LLObjectMediaNavigateClient::createResponder(const request_ptr_t &request) const
+{
+        return new LLObjectMediaNavigateClient::Responder(request);
+}
+
+const char *LLObjectMediaNavigateClient::getCapabilityName() const 
+{
+        return "ObjectMediaNavigate";
+}
+
+void LLObjectMediaNavigateClient::navigate(LLMediaDataClientObject *object, U8 texture_index, const std::string &url)
+{
+        LLSD sd_payload;
+        sd_payload[LLTextureEntry::OBJECT_ID_KEY] = object->getID();
+        sd_payload[LLMediaEntry::CURRENT_URL_KEY] = url;
+        sd_payload[LLTextureEntry::TEXTURE_INDEX_KEY] = (LLSD::Integer)texture_index;
+        
+        LL_INFOS("LLMediaDataClient") << "navigate() initiated: " << ll_print_sd(sd_payload) << LL_ENDL;
+        
+        request(object, sd_payload);
+}
+
+/*virtual*/
+void LLObjectMediaNavigateClient::Responder::error(U32 status, const std::string& reason)
+{
+        // Bounce back (unless HTTP_SERVICE_UNAVAILABLE, in which case call base
+        // class
+        if (status == HTTP_SERVICE_UNAVAILABLE)
+        {
+                LLMediaDataClient::Responder::error(status, reason);
+        }
+        else {
+                // bounce the face back
+                LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Error navigating: http code=" << status << LL_ENDL;
+                const LLSD &payload = getRequest()->getPayload();
+                // bounce the face back
+                getRequest()->getObject()->mediaNavigateBounceBack((LLSD::Integer)payload[LLTextureEntry::TEXTURE_INDEX_KEY]);
+        }
+}
+
+/*virtual*/
+void LLObjectMediaNavigateClient::Responder::result(const LLSD& content)
+{
+        LL_INFOS("LLMediaDataClient") << *(getRequest()) << " NAVIGATE returned " << ll_print_sd(content) << LL_ENDL;
+        
+        if (content.has("error"))
+        {
+                const LLSD &error = content["error"];
+                int error_code = error["code"];
+                
+                if (ERROR_PERMISSION_DENIED_CODE == error_code)
+                {
+                        LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Navigation denied: bounce back" << LL_ENDL;
+                        const LLSD &payload = getRequest()->getPayload();
+                        // bounce the face back
+                        getRequest()->getObject()->mediaNavigateBounceBack((LLSD::Integer)payload[LLTextureEntry::TEXTURE_INDEX_KEY]);
+                }
+                else {
+                        LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Error navigating: code=" << 
+                                error["code"].asString() << ": " << error["message"].asString() << LL_ENDL;
+                }                        
+                // XXX Warn user?
+        }
+        else {
+                // just do what our superclass does
+                LLMediaDataClient::Responder::result(content);
+        }
+}
diff --git a/linden/indra/newview/llmediadataclient.h b/linden/indra/newview/llmediadataclient.h
new file mode 100644
index 0000000..0ed7c57
--- /dev/null
+++ b/linden/indra/newview/llmediadataclient.h
@@ -0,0 +1,341 @@
+/** 
+ * @file llmediadataclient.h
+ * @brief class for queueing up requests to the media service
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2010, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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 LL_LLMEDIADATACLIENT_H
+#define LL_LLMEDIADATACLIENT_H
+
+#include "llhttpclient.h"
+#include <queue>
+//#include "llrefcount.h"
+//#include "llpointer.h"
+//#include "lleventtimer.h"
+
+
+// Link seam for LLVOVolume
+class LLMediaDataClientObject : public LLRefCount
+{
+public:
+        // Get the number of media data items
+        virtual U8 getMediaDataCount() const = 0;
+        // Get the media data at index, as an LLSD
+        virtual LLSD getMediaDataLLSD(U8 index) const = 0;
+        // Get this object's UUID
+        virtual LLUUID getID() const = 0;
+        // Navigate back to previous URL
+        virtual void mediaNavigateBounceBack(U8 index) = 0;
+        // Does this object have media?
+        virtual bool hasMedia() const = 0;
+        // Update the object's media data to the given array
+        virtual void updateObjectMediaData(LLSD const &media_data_array, const std::string &version_string) = 0;
+        // Return the total "interest" of the media (on-screen area)
+        virtual F64 getMediaInterest() const = 0;
+        // Return the given cap url
+        virtual std::string getCapabilityUrl(const std::string &name) const = 0;
+        // Return whether the object has been marked dead
+        virtual bool isDead() const = 0;
+        // Returns a media version number for the object
+        virtual U32 getMediaVersion() const = 0;
+        // Returns whether the object is "interesting enough" to fetch
+        virtual bool isInterestingEnough() const = 0;
+        // Returns whether we've seen this object yet or not
+        virtual bool isNew() const = 0;
+
+        // smart pointer
+        typedef LLPointer<LLMediaDataClientObject> ptr_t;
+};
+
+// This object creates a priority queue for requests.
+// Abstracts the Cap URL, the request, and the responder
+class LLMediaDataClient : public LLRefCount
+{
+public:
+    LOG_CLASS(LLMediaDataClient);
+    
+    const static F32 QUEUE_TIMER_DELAY;// = 1.0; // seconds(s)
+        const static F32 UNAVAILABLE_RETRY_TIMER_DELAY;// = 5.0; // secs
+        const static U32 MAX_RETRIES;// = 4;
+        const static U32 MAX_SORTED_QUEUE_SIZE;// = 10000;
+        const static U32 MAX_ROUND_ROBIN_QUEUE_SIZE;// = 10000;
+
+        // Constructor
+        LLMediaDataClient(F32 queue_timer_delay = QUEUE_TIMER_DELAY,
+                                          F32 retry_timer_delay = UNAVAILABLE_RETRY_TIMER_DELAY,
+                              U32 max_retries = MAX_RETRIES,
+                                          U32 max_sorted_queue_size = MAX_SORTED_QUEUE_SIZE,
+                                          U32 max_round_robin_queue_size = MAX_ROUND_ROBIN_QUEUE_SIZE);
+        
+        // Make the request
+        void request(const LLMediaDataClientObject::ptr_t &object, const LLSD &payload);
+
+        F32 getRetryTimerDelay() const { return mRetryTimerDelay; }
+        
+        // Returns true iff the queue is empty
+        bool isEmpty() const;
+        
+        // Returns true iff the given object is in the queue
+        bool isInQueue(const LLMediaDataClientObject::ptr_t &object);
+        
+        // Remove the given object from the queue. Returns true iff the given object is removed.
+        bool removeFromQueue(const LLMediaDataClientObject::ptr_t &object);
+        
+        // Called only by the Queue timer and tests (potentially)
+        bool processQueueTimer();
+        
+protected:
+        // Destructor
+        virtual ~LLMediaDataClient(); // use unref
+    
+        // Request
+        class Request : public LLRefCount
+        {
+        public:
+        enum Type {
+            GET,
+            UPDATE,
+            NAVIGATE,
+                        ANY
+        };
+        
+                Request(const char *cap_name, const LLSD& sd_payload, LLMediaDataClientObject *obj, LLMediaDataClient *mdc);
+                const char *getCapName() const { return mCapName; }
+                const LLSD &getPayload() const { return mPayload; }
+                LLMediaDataClientObject *getObject() const { return mObject; }
+
+        U32 getNum() const { return mNum; }
+
+                U32 getRetryCount() const { return mRetryCount; }
+                void incRetryCount() { mRetryCount++; }
+                
+                // Note: may return empty string!
+                std::string getCapability() const;
+        
+        Type getType() const;
+                const char *getTypeAsString() const;
+                
+                // Re-enqueue thyself
+                void reEnqueue() const;
+                
+                F32 getRetryTimerDelay() const;
+                U32 getMaxNumRetries() const;
+                
+                bool isNew() const { return mObject.notNull() ? mObject->isNew() : false; }
+                void markSent(bool flag);
+                bool isMarkedSent() const { return mMarkedSent; }
+                void updateScore();
+                F64 getScore() const { return mScore; }
+                
+        public:
+                friend std::ostream& operator<<(std::ostream &s, const Request &q);
+                
+    protected:
+        virtual ~Request(); // use unref();
+        
+        private:
+                const char *mCapName;
+                LLSD mPayload;
+                LLMediaDataClientObject::ptr_t mObject;
+                // Simple tracking
+                U32 mNum;
+                static U32 sNum;
+        U32 mRetryCount;
+                F64 mScore;
+                bool mMarkedSent;
+
+                // Back pointer to the MDC...not a ref!
+                LLMediaDataClient *mMDC;
+        };
+        typedef LLPointer<Request> request_ptr_t;
+
+        // Responder
+        class Responder : public LLHTTPClient::Responder
+        {
+        public:
+                Responder(const request_ptr_t &request);
+                //If we get back an error (not found, etc...), handle it here
+                virtual void error(U32 status, const std::string& reason);
+                //If we get back a normal response, handle it here.      Default just logs it.
+                virtual void result(const LLSD& content);
+
+                const request_ptr_t &getRequest() const { return mRequest; }
+
+    protected:
+                virtual ~Responder();
+        
+        private:
+
+                class RetryTimer : public LLEventTimer
+                {
+                public:
+                        RetryTimer(F32 time, Responder *);
+                        virtual ~RetryTimer();
+                        virtual BOOL tick();
+                private:
+                        // back-pointer
+                        boost::intrusive_ptr<Responder> mResponder;
+                };
+                
+                request_ptr_t mRequest;
+        };
+        
+protected:
+
+        // Subclasses must override this factory method to return a new responder
+        virtual Responder *createResponder(const request_ptr_t &request) const = 0;
+        
+        // Subclasses must override to return a cap name
+        virtual const char *getCapabilityName() const = 0;
+        
+        virtual void sortQueue();
+        virtual void serviceQueue();
+        
+private:
+        typedef std::list<request_ptr_t> request_queue_t;
+                
+        void enqueue(const Request*);
+        
+        // Return whether the given object is/was in the queue
+        static LLMediaDataClient::request_ptr_t findOrRemove(request_queue_t &queue, const LLMediaDataClientObject::ptr_t &obj, bool remove, Request::Type type);
+        
+        // Comparator for sorting
+        static bool compareRequests(const request_ptr_t &o1, const request_ptr_t &o2);
+        static F64 getObjectScore(const LLMediaDataClientObject::ptr_t &obj);
+    
+        friend std::ostream& operator<<(std::ostream &s, const Request &q);
+        friend std::ostream& operator<<(std::ostream &s, const request_queue_t &q);
+
+        class QueueTimer : public LLEventTimer
+        {
+        public:
+                QueueTimer(F32 time, LLMediaDataClient *mdc);
+                virtual BOOL tick();
+    protected:
+                virtual ~QueueTimer();
+        private:
+                // back-pointer
+                LLPointer<LLMediaDataClient> mMDC;
+        };
+        
+        void startQueueTimer();
+        void stopQueueTimer();
+        void setIsRunning(bool val) { mQueueTimerIsRunning = val; }
+        
+        void swapCurrentQueue();
+        request_queue_t *getCurrentQueue();
+        
+        const F32 mQueueTimerDelay;
+        const F32 mRetryTimerDelay;
+        const U32 mMaxNumRetries;
+        const U32 mMaxSortedQueueSize;
+        const U32 mMaxRoundRobinQueueSize;
+        
+        bool mQueueTimerIsRunning;
+        
+        request_queue_t mSortedQueue;
+        request_queue_t mRoundRobinQueue;
+        bool mCurrentQueueIsTheSortedQueue;
+};
+
+
+// MediaDataClient specific for the ObjectMedia cap
+class LLObjectMediaDataClient : public LLMediaDataClient
+{
+public:
+    LLObjectMediaDataClient(F32 queue_timer_delay = QUEUE_TIMER_DELAY,
+                                                        F32 retry_timer_delay = UNAVAILABLE_RETRY_TIMER_DELAY,
+                                                        U32 max_retries = MAX_RETRIES,
+                                                        U32 max_sorted_queue_size = MAX_SORTED_QUEUE_SIZE,
+                                                        U32 max_round_robin_queue_size = MAX_ROUND_ROBIN_QUEUE_SIZE)
+                : LLMediaDataClient(queue_timer_delay, retry_timer_delay, max_retries)
+                {}
+    virtual ~LLObjectMediaDataClient() {}
+    
+        void fetchMedia(LLMediaDataClientObject *object); 
+    void updateMedia(LLMediaDataClientObject *object);
+    
+protected:
+        // Subclasses must override this factory method to return a new responder
+        virtual Responder *createResponder(const request_ptr_t &request) const;
+        
+        // Subclasses must override to return a cap name
+        virtual const char *getCapabilityName() const;
+    
+    class Responder : public LLMediaDataClient::Responder
+    {
+    public:
+        Responder(const request_ptr_t &request)
+            : LLMediaDataClient::Responder(request) {}
+        virtual void result(const LLSD &content);
+    };
+};
+
+
+// MediaDataClient specific for the ObjectMediaNavigate cap
+class LLObjectMediaNavigateClient : public LLMediaDataClient
+{
+public:
+        // NOTE: from llmediaservice.h
+        static const int ERROR_PERMISSION_DENIED_CODE = 8002;
+        
+    LLObjectMediaNavigateClient(F32 queue_timer_delay = QUEUE_TIMER_DELAY,
+                                                                F32 retry_timer_delay = UNAVAILABLE_RETRY_TIMER_DELAY,
+                                                                U32 max_retries = MAX_RETRIES,
+                                                                U32 max_sorted_queue_size = MAX_SORTED_QUEUE_SIZE,
+                                                                U32 max_round_robin_queue_size = MAX_ROUND_ROBIN_QUEUE_SIZE)
+                : LLMediaDataClient(queue_timer_delay, retry_timer_delay, max_retries)
+                {}
+    virtual ~LLObjectMediaNavigateClient() {}
+    
+    void navigate(LLMediaDataClientObject *object, U8 texture_index, const std::string &url);
+    
+protected:
+        // Subclasses must override this factory method to return a new responder
+        virtual Responder *createResponder(const request_ptr_t &request) const;
+        
+        // Subclasses must override to return a cap name
+        virtual const char *getCapabilityName() const;
+
+    class Responder : public LLMediaDataClient::Responder
+    {
+    public:
+        Responder(const request_ptr_t &request)
+            : LLMediaDataClient::Responder(request) {}
+                virtual void error(U32 status, const std::string& reason);
+        virtual void result(const LLSD &content);
+    private:
+        void mediaNavigateBounceBack();
+    };
+
+};
+
+
+#endif // LL_LLMEDIADATACLIENT_H
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 8854986..23941a4 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1321,11 +1321,11 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 {
         if (avatar_id.isNull()) return;
 
-        BOOL avatar_changed = FALSE;
-        if (avatar_id != mAvatarID)
-        {
-                avatar_changed = TRUE;
-        }
+//      BOOL avatar_changed = FALSE;
+//      if (avatar_id != mAvatarID)
+//      {
+//              avatar_changed = TRUE;
+//      }
         mAvatarID = avatar_id;
 
         // Determine if we have their calling card.
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 855bb93..7137c23 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -83,8 +83,6 @@
 
 BOOL LLPanelContents::postBuild()
 {
-        LLRect rect = this->getRect();
-
         setMouseOpaque(FALSE);
 
         childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index b9a40da..d8401de 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -74,7 +74,6 @@
 
 BOOL    LLPanelFace::postBuild()
 {
-        LLRect  rect = this->getRect();
         LLTextureCtrl*  mTextureCtrl;
         LLColorSwatchCtrl*      mColorSwatch;
 
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index 3f128fe..e15f585 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -1390,13 +1390,11 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
         S32 cur_land_tax;
         S32 cur_group_tax;
         S32 cur_parcel_dir_fee;
-        S32 cur_total_tax;
         S32 proj_object_tax;
         S32 proj_light_tax;
         S32 proj_land_tax;
         S32 proj_group_tax;
         S32 proj_parcel_dir_fee;
-        S32 proj_total_tax;
         S32     non_exempt_members;
 
         msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
@@ -1420,9 +1418,6 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
         msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date);
         msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date);
 
-        cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax +  cur_parcel_dir_fee;
-        proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee;
-
         if (interval_days != mImplementationp->mIntervalLength || 
                 current_interval != mImplementationp->mCurrentInterval)
         {
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 277ab15..8103ee9 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -81,6 +81,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llwearable.h"
+#include "llwlparammanager.h"
 
 #include "hippogridmanager.h"
 
@@ -1380,9 +1381,6 @@ public:
         virtual LLUIImagePtr getIcon() const;
         virtual void openItem();
         virtual BOOL removeItem();
-        bool isSkySetting() const;
-        bool isWaterSetting() const;
-        bool isWindLight() const;
 };
 
 LLTaskNotecardBridge::LLTaskNotecardBridge(
@@ -1412,7 +1410,7 @@ void LLTaskNotecardBridge::openItem()
                 return;
         }
 // [/RLVa:KB]
-        if(isWindLight())
+        if(LLWLParamManager::isSettingsNotecard(getName()))
         {
                 return;
         }
@@ -1442,11 +1440,11 @@ BOOL LLTaskNotecardBridge::removeItem()
 }
 LLUIImagePtr LLTaskNotecardBridge::getIcon() const
 {
-        if(isSkySetting())
+        if(LLWLParamManager::isSkySettingsNotecard(getName()))
         {
                 return LLUI::getUIImage("Inv_WindLight");
         }
-        else if(isWaterSetting())
+        else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
         {
                 return LLUI::getUIImage("Inv_WaterLight");
         }
@@ -1456,22 +1454,6 @@ LLUIImagePtr LLTaskNotecardBridge::getIcon() const
         }
 }
 
-bool LLTaskNotecardBridge::isSkySetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
-}
-
-bool LLTaskNotecardBridge::isWaterSetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".ww") == 0);
-}
-
-bool LLTaskNotecardBridge::isWindLight() const
-{
-        return (isSkySetting() || isWaterSetting());
-}
-
-
 ///----------------------------------------------------------------------------
 /// Class LLTaskGestureBridge
 ///----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index c709015..4998662 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -604,18 +604,17 @@ void LLPanelLogin::addServer(const std::string& server)
         const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
 
         LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
-        S32 selectIndex = -1, i = 0;
+        S32 i = 0;
         grids->removeall();
         if (defaultGrid != "") {
                 grids->add(defaultGrid);
-                selectIndex = i++;
+                i++;
         }
         HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
         for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
                 const std::string &grid = it->second->getGridNick();
                 if (grid != defaultGrid) {
                         grids->add(grid);
-                        //if (grid == mCurGrid) selectIndex = i;
                         i++;
                 }
         }
diff --git a/linden/indra/newview/llpanelmediahud.cpp b/linden/indra/newview/llpanelmediahud.cpp
index 39c4b63..c4afe27 100644
--- a/linden/indra/newview/llpanelmediahud.cpp
+++ b/linden/indra/newview/llpanelmediahud.cpp
@@ -356,7 +356,6 @@ void LLPanelMediaHUD::updateShape()
                 media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight;
 
 
-                LLRect old_hud_rect = media_hud_rect;
                 // keep all parts of HUD on-screen
                 media_hud_rect.intersectWith(getParent()->getLocalRect());
 
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 36c479a..5d156f8 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -520,10 +520,10 @@ void LLPanelObject::getState( )
         mBtnPasteRot->setEnabled( enable_rotate );
         mBtnPasteRotClip->setEnabled( enable_rotate );
 
-        BOOL owners_identical;
         LLUUID owner_id;
         std::string owner_name;
-        owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
+        // This is still needed for the side effects, though the result is not.
+        LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
         // BUG? Check for all objects being editable?
         S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 6b7bc1b..9799de7 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -541,7 +541,7 @@ void LLPanelPermissions::refresh()
         // TODO: Creator permissions
 
         BOOL valid_base_perms           = FALSE;
-        BOOL valid_owner_perms          = FALSE;
+        //BOOL valid_owner_perms                = FALSE;
         BOOL valid_group_perms          = FALSE;
         BOOL valid_everyone_perms       = FALSE;
         BOOL valid_next_perms           = FALSE;
@@ -561,7 +561,8 @@ void LLPanelPermissions::refresh()
                                                                           &base_mask_on,
                                                                           &base_mask_off);
 
-        valid_owner_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
+        // TODO - seems odd, but this is not actually used, except to set owner_mask_*.
+        /*valid_owner_perms =*/ LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
                                                                           &owner_mask_on,
                                                                           &owner_mask_off);
 
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index b87a233..00b80f0 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -181,10 +181,10 @@ void LLPanelVolume::getState( )
                 return;
         }
 
-        BOOL owners_identical;
         LLUUID owner_id;
         std::string owner_name;
-        owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
+        // This is still needed for the side effects, though the result is not.
+        LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
         // BUG? Check for all objects being editable?
         BOOL editable = root_objectp->permModify();
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index f6f294a..3525e54 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -1072,7 +1072,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
         if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount())
         {
                 //LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject());
-                LLBBox bbox = mSavedSelectionBBox;
                 mGridOrigin = mSavedSelectionBBox.getCenterAgent();
                 mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f;
 
@@ -1090,7 +1089,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
         else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull())
         {
                 mGridRotation = first_grid_object->getRenderRotation();
-                LLVector3 first_grid_obj_pos = first_grid_object->getRenderPosition();
 
                 LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX);
                 LLVector3 max_extents(-F32_MAX, -F32_MAX, -F32_MAX);
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index d9fa5b5..a9255b3 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -2617,9 +2617,6 @@ public:
                         return;
                 }
 
-                LLVector3 nodeCenter = group->mBounds[0];
-                LLVector3 octCenter = LLVector3(group->mOctreeNode->getCenter());
-
                 for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
                 {
                         LLDrawable* drawable = *i;
@@ -2860,9 +2857,6 @@ public:
 
         virtual bool check(LLDrawable* drawable)
         {       
-                LLVector3 local_start = mStart;
-                LLVector3 local_end = mEnd;
-
                 if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible())
                 {
                         return false;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index bbb942f..d232ea8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -207,6 +207,8 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+#include "rcmoapradar.h"
+
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -266,7 +268,6 @@ bool LLStartUp::sLoginFailed = false;
 
 void login_show();
 void login_callback(S32 option, void* userdata);
-bool is_hex_string(U8* str, S32 len);
 void show_first_run_dialog();
 bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
@@ -352,7 +353,6 @@ bool idle_startup()
         const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC
         const S32 MAX_TIMEOUT_COUNT = 3;
         static LLTimer timeout;
-        static S32 timeout_count = 0;
 
         static LLTimer login_time;
         static LLTimer connecting_region_timer;
@@ -384,11 +384,10 @@ bool idle_startup()
 
         // last location by default
         static S32  agent_location_id = START_LOCATION_ID_LAST;
-        static S32  location_which = START_LOCATION_ID_LAST;
 
         static bool show_connect_box = true;
 
-        static bool stipend_since_login = false;
+        //static bool stipend_since_login = false;
 
         static bool samename = false;
 
@@ -803,8 +802,6 @@ bool idle_startup()
                 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 
-                timeout_count = 0;
-                
                 if (LLStartUp::shouldAutoLogin())
                 {
                         show_connect_box = false;
@@ -1118,7 +1115,6 @@ bool idle_startup()
                 {
                         // Force login at the last location
                         agent_location_id = START_LOCATION_ID_LAST;
-                        location_which = START_LOCATION_ID_LAST;
                         gSavedSettings.setBOOL("LoginLastLocation", FALSE);
                         
                         // Clear some things that would cause us to divert to a user-specified location
@@ -1130,21 +1126,14 @@ bool idle_startup()
                 {
                         // a startup URL was specified
                         agent_location_id = START_LOCATION_ID_URL;
-
-                        // doesn't really matter what location_which is, since
-                        // agent_start_look_at will be overwritten when the
-                        // UserLoginLocationReply arrives
-                        location_which = START_LOCATION_ID_LAST;
                 }
                 else if (gSavedSettings.getBOOL("LoginLastLocation"))
                 {
                         agent_location_id = START_LOCATION_ID_LAST;     // last location
-                        location_which = START_LOCATION_ID_LAST;
                 }
                 else
                 {
                         agent_location_id = START_LOCATION_ID_HOME;     // home
-                        location_which = START_LOCATION_ID_HOME;
                 }
 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
@@ -1790,11 +1779,11 @@ bool idle_startup()
                                         if((*it).second == "N") gAgent.setFirstLogin(TRUE);
                                         else gAgent.setFirstLogin(FALSE);
                                 }
-                                it = options[0].find("stipend_since_login");
-                                if(it != no_flag)
-                                {
-                                        if((*it).second == "Y") stipend_since_login = true;
-                                }
+                                //it = options[0].find("stipend_since_login");
+                                //if(it != no_flag)
+                                //{
+                                //      if((*it).second == "Y") stipend_since_login = true;
+                                //}
                                 it = options[0].find("gendered");
                                 if(it != no_flag)
                                 {
@@ -2086,6 +2075,16 @@ bool idle_startup()
                 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
                 gViewerWindow->adjustControlRectanglesForFirstUse(window);
 
+                if (gSavedSettings.getBOOL("ShowRadar"))
+                {
+                        LLFloaterAvatarList::showInstance();
+                }
+
+                if (gSavedSettings.getBOOL("ShowMOAPRadar"))
+                {
+                         LLFloaterMOAPRadar::showInstance();
+                }
+
                 if(gSavedSettings.getBOOL("ShowMiniMap"))
                 {
                         LLFloaterMap::showInstance();
@@ -3270,39 +3269,6 @@ void LLStartUp::deletePasswordFromDisk()
         LLFile::remove(filepath);
 }
 
-bool is_hex_string(U8* str, S32 len)
-{
-        bool rv = true;
-        U8* c = str;
-        while(rv && len--)
-        {
-                switch(*c)
-                {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                case 'a':
-                case 'b':
-                case 'c':
-                case 'd':
-                case 'e':
-                case 'f':
-                        ++c;
-                        break;
-                default:
-                        rv = false;
-                        break;
-                }
-        }
-        return rv;
-}
 
 void show_first_run_dialog()
 {
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index 5a99e66..8692c80 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -1262,8 +1262,6 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y,
                 y_end = tex_width;
         }
 
-        LLVector3d origin_global = from_region_handle(getRegion()->getHandle());
-
         // OK, for now, just have the composition value equal the height at the point.
         LLVector3 location;
         LLColor4U coloru;
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index df2191b..f8188e3 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -40,10 +40,12 @@
 
 #include "llviewerwindow.h"
 #include "lltoolcomp.h"
+#include "lltoolface.h"
 #include "lltoolfocus.h"
 #include "llfocusmgr.h"
 #include "llagent.h"
 #include "llviewerjoystick.h"
+#include "qtoolalign.h"
 
 extern BOOL gDebugClicks;
 
@@ -187,7 +189,7 @@ LLTool* LLTool::getOverrideTool(MASK mask)
         {
                 return NULL;
         }
-        if (mask & MASK_ALT)
+        else if (mask & MASK_ALT)
         {
                 return LLToolCamera::getInstance();
         }
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 7bf99f0..2ec1d8e 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -43,6 +43,7 @@
 #include "llmaniptranslate.h"
 #include "llmenugl.h"                   // for right-click menu hack
 #include "llselectmgr.h"
+#include "lltoolface.h"
 #include "lltoolfocus.h"
 #include "lltoolgrab.h"
 #include "lltoolgun.h"
@@ -131,6 +132,36 @@ void LLToolComposite::handleSelect()
         mSelected = TRUE; 
 }
 
+
+LLTool* LLToolComposite::getOverrideTool(MASK mask)
+{
+        if (gKeyboard->getKeyDown('M') && 
+                ((mask == (MASK_ALT | MASK_CONTROL)) || (mask == (MASK_ALT | MASK_CONTROL | MASK_SHIFT))))
+        {
+                return QToolAlign::getInstance();
+        }
+        else if (gKeyboard->getKeyDown('P') &&
+                (mask == (MASK_CONTROL | MASK_SHIFT)))
+        {
+                return LLToolCompTranslate::getInstance();
+        }
+        else if (gKeyboard->getKeyDown('F') &&
+                (mask == (MASK_ALT | MASK_CONTROL)))
+        {
+                return LLToolFace::getInstance();
+        }
+        else if (mask == (MASK_CONTROL | MASK_SHIFT))
+        {
+                return LLToolCompScale::getInstance();
+        }
+        else if (mask == MASK_CONTROL)
+        {
+                return LLToolCompRotate::getInstance();
+        }
+        return LLTool::getOverrideTool(mask);
+}
+
+
 //----------------------------------------------------------------------------
 // LLToolCompInspect
 //----------------------------------------------------------------------------
@@ -277,24 +308,6 @@ BOOL LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
         return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
-LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)
-{
-        if (gKeyboard->getKeyDown('A') && 
-                ((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
-        {
-                return QToolAlign::getInstance();
-        }
-        else if (mask == MASK_CONTROL)
-        {
-                return LLToolCompRotate::getInstance();
-        }
-        else if (mask == (MASK_CONTROL | MASK_SHIFT))
-        {
-                return LLToolCompScale::getInstance();
-        }
-        return LLToolComposite::getOverrideTool(mask);
-}
-
 BOOL LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
         if (mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
@@ -401,22 +414,6 @@ BOOL LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)
         return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
-LLTool* LLToolCompScale::getOverrideTool(MASK mask)
-{
-        if (gKeyboard->getKeyDown('A') && 
-                ((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
-        {
-                return QToolAlign::getInstance();
-        }
-        else if (mask == MASK_CONTROL)
-        {
-                return LLToolCompRotate::getInstance();
-        }
-
-        return LLToolComposite::getOverrideTool(mask);
-}
-
-
 BOOL LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
         if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
@@ -471,18 +468,16 @@ LLToolCompCreate::~LLToolCompCreate()
 
 BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        BOOL handled = FALSE;
         mMouseDown = TRUE;
 
         if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
         {
                 gViewerWindow->pickAsync(x, y, mask, pickCallback);
-                handled = TRUE;
         }
         else
         {
                 setCurrentTool( mPlacer );
-                handled = mPlacer->placeObject( x, y, mask );
+                mPlacer->placeObject( x, y, mask );
         }
         
         mObjectPlacedOnMouseDown = TRUE;
@@ -606,20 +601,6 @@ BOOL LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)
         return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
-LLTool* LLToolCompRotate::getOverrideTool(MASK mask)
-{
-        if (gKeyboard->getKeyDown('A') && 
-                ((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
-        {
-                return QToolAlign::getInstance();
-        }
-        else if (mask == (MASK_CONTROL | MASK_SHIFT))
-        {
-                return LLToolCompScale::getInstance();
-        }
-        return LLToolComposite::getOverrideTool(mask);
-}
-
 BOOL LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
         if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 81ed0ba..cb5e544 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -84,6 +84,9 @@ public:
                                                                 { mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); }
 
         BOOL                                    isSelecting();
+
+        virtual LLTool*                 getOverrideTool(MASK mask);
+
 protected:
         void                                    setCurrentTool( LLTool* new_tool );
         LLTool*                                 getCurrentTool()                                                                { return mCur; }
@@ -113,8 +116,8 @@ public:
         virtual ~LLToolCompInspect();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
 
         static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -135,8 +138,6 @@ public:
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);                 // Returns to the default tool
         virtual void            render();
 
-        virtual LLTool*         getOverrideTool(MASK mask);
-
         static void pickCallback(const LLPickInfo& pick_info);
 };
 
@@ -150,14 +151,12 @@ public:
         virtual ~LLToolCompScale();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);                 // Returns to the default tool
         virtual void            render();
 
-        virtual LLTool*         getOverrideTool(MASK mask);
-        
         static void pickCallback(const LLPickInfo& pick_info);
 };
 
@@ -172,17 +171,13 @@ public:
         virtual ~LLToolCompRotate();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);
         virtual void            render();
 
-        virtual LLTool*         getOverrideTool(MASK mask);
-
         static void pickCallback(const LLPickInfo& pick_info);
-
-protected:
 };
 
 //-----------------------------------------------------------------------
@@ -195,14 +190,14 @@ public:
         virtual ~LLToolCompCreate();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);
         
         static void pickCallback(const LLPickInfo& pick_info);
 protected:
         LLToolPlacer*           mPlacer;
-        BOOL                            mObjectPlacedOnMouseDown;
+        BOOL                    mObjectPlacedOnMouseDown;
 };
 
 
@@ -220,7 +215,7 @@ public:
         virtual ~LLToolCompGun();
 
         // Overridden from LLToolComposite
-    virtual BOOL                        handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL                    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL                    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL                    handleDoubleClick(S32 x, S32 y, MASK mask);
         virtual BOOL                    handleRightMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 18c4917..2adcf14 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -1521,18 +1521,6 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
         gFloaterTools->dirty();
 }
 
-struct LLGiveInventoryInfo
-{
-        LLUUID mToAgentID;
-        LLUUID mInventoryObjectID;
-        LLUUID mIMSessionID;
-        LLGiveInventoryInfo(const LLUUID& to_agent, const LLUUID& obj_id, const LLUUID &im_session_id = LLUUID::null) :
-                mToAgentID(to_agent), 
-                mInventoryObjectID(obj_id),
-                mIMSessionID(im_session_id)
-        {}
-};
-
 void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent,
                                                                           LLInventoryItem* item,
                                                                           const LLUUID& im_session_id)
@@ -1701,8 +1689,6 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
                 }
                 else 
                 {
-                        LLGiveInventoryInfo* info = NULL;
-                        info = new LLGiveInventoryInfo(to_agent, cat->getUUID(), im_session_id);
                         LLSD args;
                         args["COUNT"] = llformat("%d",giveable.countNoCopy());
                         LLSD payload;
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 735ecd9..834bf76 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -57,7 +57,7 @@
 //
 
 LLToolFace::LLToolFace()
-:       LLTool(std::string("Texture"))
+:       LLToolComposite(std::string("Texture"))
 { }
 
 
@@ -156,6 +156,7 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info)
 
 void LLToolFace::handleSelect()
 {
+        gFloaterTools->setStatusText("selectface");
         // From now on, draw faces
         LLSelectMgr::getInstance()->setTEMode(TRUE);
 }
diff --git a/linden/indra/newview/lltoolface.h b/linden/indra/newview/lltoolface.h
index f2b7d23..fc6f7de 100644
--- a/linden/indra/newview/lltoolface.h
+++ b/linden/indra/newview/lltoolface.h
@@ -34,12 +34,13 @@
 #define LL_LLTOOLFACE_H
 
 #include "lltool.h"
+#include "lltoolcomp.h"
 
 class LLViewerObject;
 class LLPickInfo;
 
 class LLToolFace
-:       public LLTool, public LLSingleton<LLToolFace>
+:       public LLToolComposite, public LLSingleton<LLToolFace>
 {
 public:
         LLToolFace();
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index ae0cd1e..c0dedb6 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -318,8 +318,6 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
         S32 dx = gViewerWindow->getCurrentMouseDX();
         S32 dy = gViewerWindow->getCurrentMouseDY();
         
-        BOOL moved_outside_slop = FALSE;
-        
         if (hasMouseCapture() && mValidClickPoint)
         {
                 mAccumX += llabs(dx);
@@ -327,19 +325,11 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 
                 if (mAccumX >= SLOP_RANGE)
                 {
-                        if (!mOutsideSlopX)
-                        {
-                                moved_outside_slop = TRUE;
-                        }
                         mOutsideSlopX = TRUE;
                 }
 
                 if (mAccumY >= SLOP_RANGE)
                 {
-                        if (!mOutsideSlopY)
-                        {
-                                moved_outside_slop = TRUE;
-                        }
                         mOutsideSlopY = TRUE;
                 }
         }
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 675412d..9e7bc5c 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -193,7 +193,7 @@ LLTool* LLToolMgr::getCurrentTool()
         else
         {
                 // due to window management weirdness we can get here with gToolNull
-                bool can_override = mBaseTool && (mBaseTool != gToolNull) ;                                     
+                bool can_override = mBaseTool && (mBaseTool != gToolNull);
                 mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
 
                 // use keyboard-override tool if available otherwise drop back to base tool
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index fd161a2..e3de706 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -119,8 +119,6 @@ void LLURLHistory::addURL(const std::string& collection, const std::string& url)
 // static
 void LLURLHistory::removeURL(const std::string& collection, const std::string& url)
 {
-        LLSD::array_iterator iter = sHistorySD[collection].beginArray();
-        LLSD::array_iterator end = sHistorySD[collection].endArray();
         for(int index = 0; index < sHistorySD[collection].size(); index++)
         {
                 if(sHistorySD[collection].get(index).asString() == url)
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index fecab65..69a5621 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -131,9 +131,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
 
         mLastPointOfInterest = point_of_interest;
 
-        // constrain to max distance from avatar
-        LLVector3 camera_offset = center - gAgent.getPositionAgent();
-
         LLViewerRegion * regp = gAgent.getRegion();
         F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
 
@@ -306,7 +303,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 {
         F32 fov_y, aspect;
         fov_y = RAD_TO_DEG * getView();
-        BOOL z_default_near, z_default_far = FALSE;
+        BOOL z_default_far = FALSE;
         if (z_far <= 0)
         {
                 z_default_far = TRUE;
@@ -314,7 +311,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
         }
         if (z_near <= 0)
         {
-                z_default_near = TRUE;
                 z_near = getNear();
         }
         aspect = getAspect();
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 5d9a55d..4495ecc 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -977,7 +977,6 @@ void render_hud_attachments()
         if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices())
         {
                 LLCamera hud_cam = *LLViewerCamera::getInstance();
-                LLVector3 origin = hud_cam.getOrigin();
                 hud_cam.setOrigin(-1.f,0,0);
                 hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1));
                 LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE);
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 0bbcadd..e4b325d 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -1,12 +1,12 @@
-/** 
+/**
  * @file llviewergenericmessage.cpp
  * @brief Handle processing of "generic messages" which contain short lists of strings.
  * @author James Cook
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-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
@@ -14,17 +14,17 @@
  * ("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.
@@ -39,7 +39,7 @@
 #include "message.h"
 #include "llagent.h"
 #include "lluuid.h"
-#include "lightshare.h"
+#include "llettherebelight.h"
 
 
 LLDispatcher gGenericDispatcher;
@@ -84,16 +84,16 @@ void process_generic_message(LLMessageSystem* msg, void**)
         msg->getUUID("AgentData", "AgentID", agent_id);
         std::string method;
         msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
-        
+
         // TODO: Use a proper dispatcher.
         if(method == "Windlight")
-        {       
-                WindlightMessage::processWindlight(msg, NULL);
+        {
+                LightShare::processWindlight(msg, NULL);
                 return;
         }
         else if(method == "WindlightReset")
         {       
-                WindlightMessage::resetRegion();
+                LightShare::resetRegion();
                 return;
         }
 
@@ -111,7 +111,7 @@ void process_generic_message(LLMessageSystem* msg, void**)
 
                 if(!gGenericDispatcher.dispatch(request, invoice, strings))
                 {
-                        llwarns << "GenericMessage " << request << " failed to dispatch" 
+                        llwarns << "GenericMessage " << request << " failed to dispatch"
                                 << llendl;
                 }
         }
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index f2f37c4..0b76f2c 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -238,6 +238,8 @@
 #include "llfloaterteleporthistory.h"
 #include "slfloatermediafilter.h"
 
+#include "rcmoapradar.h"
+
 using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
@@ -1096,10 +1098,10 @@ void init_debug_ui_menu(LLMenuGL* menu)
         menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
         menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
         menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
-        menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL));
-        menu->append(new LLMenuItemCallGL( "Print Selected Object Info",        &print_object_info, NULL, NULL, 'P', MASK_CONTROL|MASK_SHIFT ));
-        menu->append(new LLMenuItemCallGL( "Print Agent Info",                  &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT ));
-        menu->append(new LLMenuItemCallGL( "Memory Stats",  &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
+        menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus));
+        menu->append(new LLMenuItemCallGL( "Print Selected Object Info",        &print_object_info));
+        menu->append(new LLMenuItemCallGL( "Print Agent Info",                  &print_agent_nvpairs));
+        menu->append(new LLMenuItemCallGL( "Memory Stats",  &output_statistics));
         menu->append(new LLMenuItemCheckGL("Double-Click Auto-Pilot", 
                 menu_toggle_control, NULL, menu_check_control, 
                 (void*)"DoubleClickAutoPilot"));
@@ -1256,7 +1258,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Octree",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_OCTREE));
-        // For Imprudence 1.3 - need to XUIfy
         sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
@@ -5216,6 +5217,24 @@ class LLViewEnableLastChatter : public view_listener_t
         }
 };
 
+class LLViewToggleRadar: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterAvatarList::toggle(0);
+                return true;
+        }
+};
+
+class LLViewToggleMOAPRadar: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterMOAPRadar::toggle(0);
+                return true;
+        }
+};
+
 class LLEditEnableDeselect : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -8946,12 +8965,6 @@ class LLAdvancedToggleAssetBrowser: public view_listener_t
         {
                 //open the floater
                 LLFloaterAssetBrowser::show(0);
-                
-                bool vis = false;
-                if(LLFloaterAssetBrowser::getInstance())
-                {
-                        vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
-                }
                 return true;
         }
 };
@@ -9058,7 +9071,7 @@ class LLAdvancedToggleRenderType : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                U32 render_type = render_type_from_string( userdata.asString() );
+                intptr_t render_type = render_type_from_string( userdata.asString() );
                 if ( render_type != 0 )
                 {
                         LLPipeline::toggleRenderTypeControl( (void*)render_type );
@@ -9072,7 +9085,7 @@ class LLAdvancedCheckRenderType : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                U32 render_type = render_type_from_string( userdata["data"].asString() );
+                intptr_t render_type = render_type_from_string( userdata["data"].asString() );
                 bool new_value = false;
 
                 if ( render_type != 0 )
@@ -9138,7 +9151,7 @@ class LLAdvancedToggleFeature : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                U32 feature = feature_from_string( userdata.asString() );
+                intptr_t feature = feature_from_string( userdata.asString() );
 
                 if ( feature != 0 )
                 {
@@ -9154,7 +9167,7 @@ class LLAdvancedCheckFeature : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                U32 feature = feature_from_string( userdata["data"].asString() );
+                intptr_t feature = feature_from_string( userdata["data"].asString() );
                 bool new_value = false;
 
                 if ( feature != 0 )
@@ -9249,6 +9262,10 @@ U32 info_display_from_string(std::string info_display)
         {
                 return LLPipeline::RENDER_DEBUG_SCULPTED;
         }
+        else if ("shadow frusta" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA;
+        }
         else
         {
                 return 0;
@@ -9260,7 +9277,7 @@ class LLAdvancedToggleInfoDisplay : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                U32 info_display = info_display_from_string( userdata.asString() );
+                intptr_t info_display = info_display_from_string( userdata.asString() );
 
                 if ( info_display != 0 )
                 {
@@ -9276,7 +9293,7 @@ class LLAdvancedCheckInfoDisplay : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                U32 info_display = info_display_from_string( userdata["data"].asString() );
+                intptr_t info_display = info_display_from_string( userdata["data"].asString() );
                 bool new_value = false;
 
                 if ( info_display != 0 )
@@ -11215,6 +11232,8 @@ void initialize_menus()
         addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
         addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
         addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
+    addMenu(new LLViewToggleRadar(), "View.ToggleAvatarList");
+        addMenu(new LLViewToggleMOAPRadar(), "View.ToggleMOAPList");
 
         addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
         addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9a0cf47..10d701d 100755..100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1,12 +1,12 @@
 
-/** 
+/**
  * @file llviewermessage.cpp
  * @brief Dumping ground for viewer-side message system callbacks.
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
+ *
  * Copyright (c) 2002-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
@@ -14,17 +14,17 @@
  * ("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.
@@ -37,7 +37,7 @@
 
 #include <deque>
 
-#include "llaudioengine.h" 
+#include "llaudioengine.h"
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
 #include "mean_collision_data.h"
@@ -65,7 +65,7 @@
 #include "lltimer.h"
 #include "llmd5.h"
 
-#include "lightshare.h"
+#include "llettherebelight.h"
 #include "llagent.h"
 #include "llcallingcard.h"
 #include "llconsole.h"
@@ -132,6 +132,7 @@
 #include "llvlmanager.h"
 #include "llvoavatar.h"
 #include "llvotextbubble.h"
+#include "llwlparammanager.h"
 #include "llweb.h"
 #include "llworld.h"
 #include "pipeline.h"
@@ -151,7 +152,6 @@
 
 #include "hippogridmanager.h"
 #include "hippolimits.h"
-#include "wlsettingsmanager.h"
 
 #if LL_WINDOWS // For Windows specific error handler
 #include "llwindebug.h" // For the invalid message handler
@@ -199,8 +199,8 @@ const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
 const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
 
 //script permissions
-const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = 
-        { 
+const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
+        {
                 "ScriptTakeMoney",
                 "ActOnControlInputs",
                 "RemapControlInputs",
@@ -214,7 +214,7 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
                 "ControlYourCamera"
         };
 
-const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = 
+const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
 {
         TRUE,   // ScriptTakeMoney,
         FALSE,  // ActOnControlInputs
@@ -466,7 +466,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 //                                      char image_uuid_str[UUID_STR_SIZE];             /* Flawfinder: ignore */
 //                                      memcpy(image_uuid_str, pos_uuid+2, UUID_STR_SIZE-1);            /* Flawfinder: ignore */
 //                                      image_uuid_str[UUID_STR_SIZE-1] = 0;
-                                        
+
 //                                      LLUUID image_uuid(image_uuid_str);
 
 //                                      LL_INFOS("Messaging") << "Found UUID: " << image_uuid << LL_ENDL;
@@ -541,7 +541,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 //      else
 //      {
 //              LLFILE* fIn = LLFile::fopen(filename, "rb");            /* Flawfinder: ignore */
-//              if (fIn) 
+//              if (fIn)
 //              {
 //                      LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C;
 //                      LLPointer<LLImageTGA> TargaUtility = new LLImageTGA;
@@ -562,13 +562,13 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 
 //                      ImageUtility->updateData();
 //                      ImageUtility->decode(image, 100000.0f);
-                        
+
 //                      TargaUtility->encode(image);
 //                      U8 *data = TargaUtility->getData();
 //                      S32 data_size = TargaUtility->getDataSize();
 
 //                      std::string file_path = gDirUtilp->getDirName(filename);
-                        
+
 //                      std::string output_file = llformat("%s/image-%03d.tga", file_path.c_str(), image_num);//filename;
 //                      //S32 name_len = output_file.length();
 //                      //strcpy(&output_file[name_len-3], "tga");
@@ -657,7 +657,6 @@ void send_sound_trigger(const LLUUID& sound_id, F32 gain)
 bool join_group_response(const LLSD& notification, const LLSD& response)
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
-        BOOL delete_context_data = TRUE;
         bool accept_invite = false;
 
         LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -686,7 +685,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                 }
                 else
                 {
-                        delete_context_data = FALSE;
                         LLSD args;
                         args["NAME"] = name;
                         args["INVITE"] = message;
@@ -700,7 +698,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                 // sure the user is sure they want to join.
                 if (fee > 0)
                 {
-                        delete_context_data = FALSE;
                         LLSD args;
                         args["COST"] = llformat("%d", fee);
                         args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
@@ -756,10 +753,10 @@ private:
         std::string mFromName;
 };
 
-//unlike the FetchObserver for AgentOffer, we only make one 
+//unlike the FetchObserver for AgentOffer, we only make one
 //instance of the AddedObserver for TaskOffers
-//and it never dies.  We do this because we don't know the UUID of 
-//task offers until they are accepted, so we don't wouldn't 
+//and it never dies.  We do this because we don't know the UUID of
+//task offers until they are accepted, so we don't wouldn't
 //know what to watch for, so instead we just watch for all additions.
 class LLOpenTaskOffer : public LLInventoryAddedObserver
 {
@@ -776,7 +773,7 @@ LLOpenTaskOffer* gNewInventoryObserver=NULL;
 
 void start_new_inventory_observer()
 {
-        if (!gNewInventoryObserver) //task offer observer 
+        if (!gNewInventoryObserver) //task offer observer
         {
                 // Observer is deleted by gInventory
                 gNewInventoryObserver = new LLOpenTaskOffer;
@@ -835,7 +832,7 @@ protected:
 
 
 //Returns TRUE if we are OK, FALSE if we are throttled
-//Set check_only true if you want to know the throttle status 
+//Set check_only true if you want to know the throttle status
 //without registering a hit
 bool check_offer_throttle(const std::string& from_name, bool check_only)
 {
@@ -851,7 +848,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
         {
                 return gThrottleTimer.hasExpired();
         }
-        
+
         if(gThrottleTimer.checkExpirationAndReset(OFFER_THROTTLE_TIME))
         {
                 LL_DEBUGS("Messaging") << "Throttle Expired" << LL_ENDL;
@@ -897,7 +894,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
                 }
         }
 }
- 
+
 void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 {
         std::vector<LLUUID>::const_iterator it = items.begin();
@@ -928,11 +925,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                         {
                         case LLAssetType::AT_NOTECARD:
                                 // Don't show WindLight settings as notecards.
-                                // *TODO: centralise all these damned .wl/.ww checks somewhere.
-                                if((item->getName().length() > 2 && item->getName().compare(item->getName().length() - 3, 3, ".wl") != 0) &&
-                                        (item->getName().compare(item->getName().length() - 3, 3, ".ww") != 0))
+                                if(!LLWLParamManager::isSettingsNotecard(item->getName()))
                                 {
-                                        open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), 
+                                        open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(),
                                                 LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
                                 }
                                 break;
@@ -948,7 +943,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                         }
                 }
                 //highlight item, if it's not in the trash or lost+found
-                
+
                 // Don't auto-open the inventory floater
                 LLInventoryView* view = LLInventoryView::getActiveInventory();
                 if(!view)
@@ -1028,7 +1023,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
                 OfferMatcher(const LLUUID& to_block) : blocked_id(to_block) {}
                 BOOL matches(const LLNotificationPtr notification) const
                 {
-                        if(notification->getName() == "ObjectGiveItem" 
+                        if(notification->getName() == "ObjectGiveItem"
                                 || notification->getName() == "ObjectGiveItemUnknownUser"
                                 || notification->getName() == "UserGiveItem")
                         {
@@ -1104,7 +1099,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
         std::string name;
         gAgent.buildFullname(name);
         msg->addStringFast(_PREHASH_FromAgentName, name);
-        msg->addStringFast(_PREHASH_Message, ""); 
+        msg->addStringFast(_PREHASH_Message, "");
         msg->addU32Fast(_PREHASH_ParentEstateID, 0);
         msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
         msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
@@ -1164,9 +1159,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
         {
                 from_string = chatHistory_string = mFromName;
         }
-        
+
         bool busy=FALSE;
-        
+
         switch(button)
         {
         case IOR_ACCEPT:
@@ -1188,7 +1183,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                 // ACCEPT. The math for the dialog works, because the accept
                 // for inventory_offered, task_inventory_offer or
                 // group_notice_inventory is 1 greater than the offer integer value.
-                // Generates IM_INVENTORY_ACCEPTED, IM_TASK_INVENTORY_ACCEPTED, 
+                // Generates IM_INVENTORY_ACCEPTED, IM_TASK_INVENTORY_ACCEPTED,
                 // or IM_GROUP_NOTICE_INVENTORY_ACCEPTED
                 msg->addU8Fast(_PREHASH_Dialog, (U8)(mIM + 1));
                 msg->addBinaryDataFast(_PREHASH_BinaryBucket, &(mFolderID.mData),
@@ -1288,7 +1283,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                 LLFloaterChat::addChatHistory(chat);
 
                 // If it's from an agent, we have to fetch the item to throw
-                // it away. If it's from a task or group, just denying the 
+                // it away. If it's from a task or group, just denying the
                 // request will suffice to discard the item.
                 if(IM_INVENTORY_OFFERED == mIM)
                 {
@@ -1306,7 +1301,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                         {
                                 opener = discard_agent_offer;
                         }
-                        
+
                 }
                 if (busy &&     (!mFromGroup && !mFromObject))
                 {
@@ -1338,7 +1333,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                 info->forceResponse(IOR_BUSY);
                 return;
         }
-        
+
         //If muted, don't even go through the messaging stuff.  Just curtail the offer here.
         if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName))
         {
@@ -1377,7 +1372,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                 }
 // [/RLVa:KB]
         }
-        
+
         LLSD args;
         args["[OBJECTNAME]"] = msg;
 
@@ -1480,7 +1475,7 @@ static LLNotificationFunctorRegistration group_vote_callback_reg("GroupVote", gr
 bool lure_callback(const LLSD& notification, const LLSD& response)
 {
         S32 option = 0;
-        if (response.isInteger()) 
+        if (response.isInteger())
         {
                 option = response.asInteger();
         }
@@ -1488,7 +1483,7 @@ bool lure_callback(const LLSD& notification, const LLSD& response)
         {
                 option = LLNotification::getSelectedOption(notification, response);
         }
-        
+
         LLUUID from_id = notification["payload"]["from_id"].asUUID();
         LLUUID lure_id = notification["payload"]["lure_id"].asUUID();
         BOOL godlike = notification["payload"]["godlike"].asBoolean();
@@ -1548,7 +1543,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         S32 binary_bucket_size;
         LLChat chat;
         std::string buffer;
-        
+
         // *TODO:translate - need to fix the full name to first/last (maybe)
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
         msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
@@ -1573,7 +1568,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         BOOL is_owned_by_me = FALSE;
 
         LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
-        
         chat.mMuted = is_muted && !is_god;
         chat.mFromID = from_id;
         chat.mFromName = name;
@@ -1722,7 +1716,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         || dialog == IM_TYPING_STOP
         || dialog == IM_BUSY_AUTO_RESPONSE)
         {
-                
+
                 if(session_id != computed_session_id)
                 {
                         session_id = computed_session_id;
@@ -1961,7 +1955,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                                 }
                                         }
                                         //InstantMessageResponseItem<
-                                        
+
                                 }
                         }
                 }
@@ -1981,10 +1975,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 LLNotifications::instance().add("SystemMessageTip",args);
                 break;
 
-        case IM_NOTHING_SPECIAL: 
+        case IM_NOTHING_SPECIAL:
                 // Don't show dialog, just do IM
                 if (!gAgent.isGodlike()
-                                && gAgent.getRegion()->isPrelude() 
+                                && gAgent.getRegion()->isPrelude()
                                 && to_id.isNull() )
                 {
                         // do nothing -- don't distract newbies in
@@ -2005,7 +1999,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                               ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
 // [/RLVa:KB]
                 {
-                        // return a standard "busy" message, but only do it to online IM 
+                        // return a standard "busy" message, but only do it to online IM
                         // (i.e. not other auto responses and not store-and-forward IM)
                         if (!gIMMgr->hasSession(session_id))
                         {
@@ -2031,7 +2025,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         // now store incoming IM in chat history
 
                         buffer = separator_string + message.substr(message_offset);
-        
+
                         LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
                         // add to IM panel, but do not bother the user
@@ -2177,7 +2171,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 U8 item_name[DB_INV_ITEM_NAME_BUF_SIZE];
                         }* notice_bin_bucket;
 
-                        // Make sure the binary bucket is big enough to hold the header 
+                        // Make sure the binary bucket is big enough to hold the header
                         // and a null terminated item name.
                         if ( (binary_bucket_size < (S32)((sizeof(notice_bucket_header_t) + sizeof(U8))))
                                 || (binary_bucket[binary_bucket_size - 1] != '\0') )
@@ -2198,7 +2192,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         if (has_inventory)
                         {
                                 info = new LLOfferInfo;
-                                
+
                                 info->mIM = IM_GROUP_NOTICE;
                                 info->mFromID = from_id;
                                 info->mFromGroup = from_group;
@@ -2214,7 +2208,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 info->mDesc = item_name;
                                 info->mHost = msg->getSender();
                         }
-                        
+
                         std::string str(message);
 
                         // Tokenize the string.
@@ -2418,7 +2412,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 LL_WARNS("Messaging") << "Received IM: IM_GROUP_ELECTION_DEPRECATED" << LL_ENDL;
         }
         break;
-        
+
         case IM_SESSION_SEND:
         {
                 if (!is_god && is_busy)
@@ -2480,7 +2474,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         {
                                 group_name = std::string((char*)binary_bucket);
                         }
-                        chat.mText = std::string("IM [") + group_name + std::string("] ") + name 
+                        chat.mText = std::string("IM [") + group_name + std::string("] ") + name
                                                 + separator_string + saved + message.substr(message_offset);
                 }
                 else
@@ -2527,7 +2521,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
 
                                 std::string tempname = name;
-                
+
                                 size_t found = tempname.find(" ");
                                 while(found != std::string::npos)
                                 {
@@ -2539,7 +2533,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 {
                                         name = ">>";
                                         chat.mFromName = name;
-                                        
+
                                 }
 
                         std::ostringstream link;
@@ -2591,14 +2585,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         gIMMgr->addMessage(session_id, from_id, name, buffer);
                 }
                 break;
-                
+
         case IM_LURE_USER:
                 {
                         if (is_muted)
-                        { 
+                        {
                                 return;
                         }
-                        else if (is_busy) 
+                        else if (is_busy)
                         {
                                 busy_message(msg,from_id);
                         }
@@ -2734,7 +2728,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
 
                         std::string url;
-                        
+
                         url.assign((char*)binary_bucket, binary_bucket_size-1);
                         args["MESSAGE"] = message;
                         args["URL"] = url;
@@ -2784,11 +2778,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         // as the database should already include the relationship.  But it
                         // doesn't hurt for dupes.
                         LLAvatarTracker::formFriendship(from_id);
-                        
+
                         std::vector<std::string> strings;
                         strings.push_back(from_id.asString());
                         send_generic_message("requestonlinenotification", strings);
-                        
+
                         args["NAME"] = name;
                         LLNotifications::instance().add("FriendshipAccepted", args);
                 }
@@ -2808,7 +2802,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         }
 }
 
-void busy_message (LLMessageSystem* msg, LLUUID from_id) 
+void busy_message (LLMessageSystem* msg, LLUUID from_id)
 {
         if (gAgent.getBusy())
         {
@@ -2851,7 +2845,7 @@ bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
                 msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
                 break;
         case 1:
-                // decline              
+                // decline
                 msg->newMessageFast(_PREHASH_DeclineCallingCard);
                 msg->nextBlockFast(_PREHASH_AgentData);
                 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -2902,7 +2896,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 
         if(!source_name.empty())
         {
-                if (gAgent.getBusy() 
+                if (gAgent.getBusy()
                         || LLMuteList::getInstance()->isMuted(source_id, source_name, LLMute::flagTextChat))
                 {
                         // automatically decline offer
@@ -2959,13 +2953,13 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
         msg->getString("ChatData", "FromName", from_name);
         chat.mFromName = from_name;
-        
+
         msg->getUUID("ChatData", "SourceID", from_id);
         chat.mFromID = from_id;
-        
+
         // Object owner for objects
         msg->getUUID("ChatData", "OwnerID", owner_id);
-        
+
         msg->getU8Fast(_PREHASH_ChatData, _PREHASH_SourceType, source_temp);
         chat.mSourceType = (EChatSourceType)source_temp;
 
@@ -2974,9 +2968,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
         msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
         chat.mAudible = (EChatAudible)audible_temp;
-        
+
         chat.mTime = LLFrameTimer::getElapsedSeconds();
-        
+
         BOOL is_busy = gAgent.getBusy();
 
         BOOL is_muted = FALSE;
@@ -2984,7 +2978,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
         is_muted = LLMuteList::getInstance()->isMuted(
                 from_id,
                 from_name,
-                LLMute::flagTextChat) 
+                LLMute::flagTextChat)
                 || LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
         is_god = chat.mSourceType != CHAT_SOURCE_OBJECT &&
                 LLMuteList::getInstance()->isGod(from_name);
@@ -2994,9 +2988,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
         if (chatter)
         {
                 chat.mPosAgent = chatter->getPositionAgent();
-                
+
                 // Make swirly things only for talking objects. (not script debug messages, though)
-//              if (chat.mSourceType == CHAT_SOURCE_OBJECT 
+//              if (chat.mSourceType == CHAT_SOURCE_OBJECT
 //                      && chat.mChatType != CHAT_TYPE_DEBUG_MSG)
 // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
                 // Don't show swirly things for llOwnerSay() chat here because we handle those further down
@@ -3008,7 +3002,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                         psc->setSourceObject(chatter);
                         psc->setColor(color);
-                        //We set the particles to be owned by the object's owner, 
+                        //We set the particles to be owned by the object's owner,
                         //just in case they should be muted by the mute list
                         psc->setOwnerUUID(owner_id);
                         LLViewerPartSim::getInstance()->addPartSource(psc);
@@ -3018,7 +3012,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 if (is_audible
                         && (is_god || (!is_muted && !is_busy)))
                 {
-                        if (chat.mChatType != CHAT_TYPE_START 
+                        if (chat.mChatType != CHAT_TYPE_START
                                 && chat.mChatType != CHAT_TYPE_STOP)
                         {
                                 gAgent.heardChat(chat.mFromID);
@@ -3028,7 +3022,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 is_owned_by_me = chatter->permYouOwner();
         }
 
-        if(chat.mSourceType == CHAT_SOURCE_OBJECT 
+        if(chat.mSourceType == CHAT_SOURCE_OBJECT
                 && chat.mChatType != CHAT_TYPE_DEBUG_MSG
                 && !owner_id.isNull()
                 && owner_id != gAgent.getID())
@@ -3090,7 +3084,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 
 // [RLVa:KB] - Checked: 2009-10-06 (RLVa-1.0.4d) | Modified: RLVa-1.0.4d
-                if ( (rlv_handler_t::isEnabled()) && 
+                if ( (rlv_handler_t::isEnabled()) &&
                          (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) && (CHAT_TYPE_OWNER != chat.mChatType) )
                 {
                         // NOTE: chatter can be NULL (may not have rezzed yet, or could be another avie's HUD attachment)
@@ -3099,7 +3093,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         // Filtering "rules":
                         //   avatar  => filter all avie text (unless it's this avie or they're an exemption)
                         //   objects => filter everything except attachments this avie owns
-                        if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) || 
+                        if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) ||
                                  ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && ((!is_owned_by_me) || (!is_attachment)) ) )
                         {
                                 if (!rlvIsEmote(mesg))
@@ -3122,7 +3116,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                 {
                                         if (chat.mFromID != gAgent.getID())
                                                 from_name = RlvStrings::getAnonym(from_name);
-                                } 
+                                }
                                 else
                                 {
                                         if ( (!is_owned_by_me) || (!is_attachment) )
@@ -3164,7 +3158,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         if (LLFloaterMap::getInstance())
                         {
                                 PanelRadarEntry* entry = LLFloaterMap::getInstance()->getRadar()->getEntry(from_id);
-                                if (entry) 
+                                if (entry)
                                 {
                                         entry->setStatus(RADAR_STATUS_TYPING);
                                 }
@@ -3185,7 +3179,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         if (LLFloaterMap::getInstance())
                         {
                                 PanelRadarEntry* entry = LLFloaterMap::getInstance()->getRadar()->getEntry(from_id);
-                                if (entry) 
+                                if (entry)
                                 {
                                         entry->setStatus(RADAR_STATUS_NONE);
                                 }
@@ -3202,7 +3196,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
                         if (!is_muted && !is_busy)
                         {
-                                
+
                                 BOOL sUseChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
                                 if(sUseChatBubbles)
                                 {
@@ -3288,7 +3282,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                                 verb = " retained: @";
                                                 mesg = strRetained;
                                         }
-                                        else 
+                                        else
                                         {
                                                 verb = ": @";
                                                 if (!strExecuted.empty())
@@ -3309,7 +3303,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                         LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                                         psc->setSourceObject(chatter);
                                         psc->setColor(color);
-                                        //We set the particles to be owned by the object's owner, 
+                                        //We set the particles to be owned by the object's owner,
                                         //just in case they should be muted by the mute list
                                         psc->setOwnerUUID(owner_id);
                                         LLViewerPartSim::getInstance()->addPartSource(psc);
@@ -3337,7 +3331,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         chat.mText += verb;
                         chat.mText += mesg;
                 }
-                
+
                 if (chatter)
                 {
                         chat.mPosAgent = chatter->getPositionAgent();
@@ -3374,10 +3368,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 
 // Simulator we're on is informing the viewer that the agent
-// is starting to teleport (perhaps to another sim, perhaps to the 
-// same sim). If we initiated the teleport process by sending some kind 
-// of TeleportRequest, then this info is redundant, but if the sim 
-// initiated the teleport (via a script call, being killed, etc.) 
+// is starting to teleport (perhaps to another sim, perhaps to the
+// same sim). If we initiated the teleport process by sending some kind
+// of TeleportRequest, then this info is redundant, but if the sim
+// initiated the teleport (via a script call, being killed, etc.)
 // then this info is news to us.
 void process_teleport_start(LLMessageSystem *msg, void**)
 {
@@ -3404,7 +3398,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
                 gTeleportDisplay = TRUE;
                 gAgent.setTeleportState( LLAgent::TELEPORT_START );
                 make_ui_sound("UISndTeleportOut");
-                
+
                 // Don't call LLFirstUse::useTeleport here because this could be
                 // due to being killed, which would send you home, not to a Telehub
         }
@@ -3441,7 +3435,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
         //if we don't find the coresponding mapping in our progress mappings
         std::string message = buffer;
 
-        if (LLAgent::sTeleportProgressMessages.find(buffer) != 
+        if (LLAgent::sTeleportProgressMessages.find(buffer) !=
                 LLAgent::sTeleportProgressMessages.end() )
         {
                 message = LLAgent::sTeleportProgressMessages[buffer];
@@ -3502,7 +3496,7 @@ public:
 
 
 
-class LLPostTeleportNotifiers : public LLEventTimer 
+class LLPostTeleportNotifiers : public LLEventTimer
 {
 public:
         LLPostTeleportNotifiers();
@@ -3529,10 +3523,10 @@ BOOL LLPostTeleportNotifiers::tick()
                 LLInventoryFetchDescendentsObserver::folder_ref_t folders;
                 LLUUID folder_id;
                 folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-                if(folder_id.notNull()) 
+                if(folder_id.notNull())
                         folders.push_back(folder_id);
                 folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
-                if(folder_id.notNull()) 
+                if(folder_id.notNull())
                         folders.push_back(folder_id);
                 if(!folders.empty())
                 {
@@ -3588,7 +3582,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
         msg->getU64Fast(_PREHASH_Info, _PREHASH_RegionHandle, region_handle);
         U32 teleport_flags;
         msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
-        
+
         U32 region_size_x = 256;
         msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
         U32 region_size_y = 256;
@@ -3600,17 +3594,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
                 region_size_x = 256;
                 region_size_y = 256;
         }
-        
+
         std::string seedCap;
         msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability, seedCap);
 
-        // update home location if we are teleporting out of prelude - specific to teleporting to welcome area 
+        // update home location if we are teleporting out of prelude - specific to teleporting to welcome area
         if((teleport_flags & TELEPORT_FLAGS_SET_HOME_TO_TARGET)
            && (!gAgent.isGodlike()))
         {
                 gAgent.setHomePosRegion(region_handle, pos);
 
-                // Create a timer that will send notices when teleporting is all finished.  Since this is 
+                // Create a timer that will send notices when teleporting is all finished.  Since this is
                 // based on the LLEventTimer class, it will be managed by that class and not orphaned or leaked.
                 new LLPostTeleportNotifiers();
         }
@@ -3674,8 +3668,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 //      gViewerWindow->setShowProgress(TRUE);
 
         // Tell the LightShare handler that we have changed regions.
-        WindlightMessage::resetRegion();
-        WLSettingsManager::wlresetRegion();
+        LightShare::resetRegion();
 }
 
 // stuff we have to do every time we get an AvatarInitComplete from a sim
@@ -3713,7 +3706,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
         msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at);
         U64 region_handle;
         msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle);
-        
+
         std::string version_channel;
         msg->getString("SimData", "ChannelVersion", version_channel);
 
@@ -3735,8 +3728,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                         LL_WARNS("Messaging") << "current region " << gAgent.getRegion()->getOriginGlobal() << LL_ENDL;
                 }
 
-                LL_WARNS("Messaging") << "Agent being sent to invalid home region: " 
-                        << x << ":" << y 
+                LL_WARNS("Messaging") << "Agent being sent to invalid home region: "
+                        << x << ":" << y
                         << " current pos " << gAgent.getPositionGlobal()
                         << LL_ENDL;
                 LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region.");
@@ -3784,7 +3777,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 //              if (avatarp)
                 {
                         // Chat the "back" SLURL. (DEV-4907)
-                        // Show this in the console if DisableTeleportScreens is true 
+                        // Show this in the console if DisableTeleportScreens is true
                         // Why? Because it's nifty, that's why -- MC
                         LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
                         chat.mSourceType = CHAT_SOURCE_SYSTEM;
@@ -3874,7 +3867,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
         {
                 avatarp->mFootPlane.clearVec();
         }
-        
+
         // send walk-vs-run status
         gAgent.sendWalkRun(gAgent.getRunning() || gAgent.getAlwaysRun());
 
@@ -3931,7 +3924,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
         LLHost sim_host(sim_ip, sim_port);
         U64 region_handle;
         msg->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
-        
+
         std::string seedCap;
         msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
@@ -3953,8 +3946,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
         regionp->setSeedCapability(seedCap);
 
         // Tell the LightShare handler that we have changed regions.
-        WindlightMessage::resetRegion();
-        WLSettingsManager::wlresetRegion();
+        LightShare::resetRegion();
 }
 
 
@@ -4000,11 +3992,11 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
         const U8 DUP_MSGS = 1;                          //  HACK!  number of times to repeat data on motionless agent
 
         //  Store data on last sent update so that if no changes, no send
-        static LLVector3 last_camera_pos_agent, 
-                                         last_camera_at, 
+        static LLVector3 last_camera_pos_agent,
+                                         last_camera_at,
                                          last_camera_left,
                                          last_camera_up;
-        
+
         static LLVector3 cam_center_chg,
                                          cam_rot_chg;
 
@@ -4057,13 +4049,13 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 
         head_rot_chg = dot(last_head_rot, head_rotation);
 
-        if (force_send || 
-                (cam_center_chg.magVec() > TRANSLATE_THRESHOLD) || 
-                (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT) ||     
+        if (force_send ||
+                (cam_center_chg.magVec() > TRANSLATE_THRESHOLD) ||
+                (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT) ||
                 (last_render_state != render_state) ||
                 (cam_rot_chg.magVec() > ROTATION_THRESHOLD) ||
                 control_flag_change != 0 ||
-                flag_change != 0)  
+                flag_change != 0)
         {
 /*
                 if (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT)
@@ -4071,7 +4063,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
                         //LL_INFOS("Messaging") << "head rot " << head_rotation << LL_ENDL;
                         LL_INFOS("Messaging") << "head_rot_chg = " << head_rot_chg << LL_ENDL;
                 }
-                if (cam_rot_chg.magVec() > ROTATION_THRESHOLD) 
+                if (cam_rot_chg.magVec() > ROTATION_THRESHOLD)
                 {
                         LL_INFOS("Messaging") << "cam rot " <<  cam_rot_chg.magVec() << LL_ENDL;
                 }
@@ -4102,8 +4094,8 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
                         // some threshold from the last update, however this can break fine
                         // adjustments when trying to aim an attached gun, so what we do here
                         // (where we would normally skip sending an update when nothing has changed)
-                        // is gradually reduce the threshold to allow a better update to 
-                        // eventually get sent... should update to within 0.5 degrees in less 
+                        // is gradually reduce the threshold to allow a better update to
+                        // eventually get sent... should update to within 0.5 degrees in less
                         // than a second.
                         if (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT + (MAX_HEAD_ROT_QDOT - THRESHOLD_HEAD_ROT_QDOT) * duplicate_count / AGENT_UPDATES_PER_SECOND)
                         {
@@ -4136,13 +4128,13 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 //              {
 //                      LL_INFOS("Messaging") << "Sending camera center " << camera_pos_agent << LL_ENDL;
 //              }
-                
+
                 msg->addVector3Fast(_PREHASH_CameraCenter, camera_pos_agent);
                 msg->addVector3Fast(_PREHASH_CameraAtAxis, LLViewerCamera::getInstance()->getAtAxis());
                 msg->addVector3Fast(_PREHASH_CameraLeftAxis, LLViewerCamera::getInstance()->getLeftAxis());
                 msg->addVector3Fast(_PREHASH_CameraUpAxis, LLViewerCamera::getInstance()->getUpAxis());
                 msg->addF32Fast(_PREHASH_Far, gAgent.mDrawDistance);
-                
+
                 msg->addU32Fast(_PREHASH_ControlFlags, control_flags);
 
                 if (gDebugClicks)
@@ -4171,7 +4163,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 
 //              LL_DEBUGS("Messaging") << "agent " << avatar_pos_agent << " cam " << camera_pos_agent << LL_ENDL;
 
-                // Copy the old data 
+                // Copy the old data
                 last_head_rot = head_rotation;
                 last_render_state = render_state;
                 last_camera_pos_agent = camera_pos_agent;
@@ -4190,7 +4182,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 extern U32 gObjectBits;
 
 void process_object_update(LLMessageSystem *mesgsys, void **user_data)
-{       
+{
         LLMemType mt(LLMemType::MTYPE_OBJECT);
         // Update the data counters
         if (mesgsys->getReceiveCompressedSize())
@@ -4396,7 +4388,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 
         // Don't play sounds triggered by someone you muted.
         if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-        
+
         // Don't play sounds from an object you muted
         if (LLMuteList::getInstance()->isMuted(object_id)) return;
 
@@ -4426,7 +4418,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         {
                 return;
         }*/
-                
+
         gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
 
@@ -4450,10 +4442,10 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
 
         if (LLMuteList::getInstance()->isMuted(object_id)) return;
         if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-        
+
         LLAudioSource *sourcep = objectp->getAudioSource(owner_id);
         if (!sourcep) return;
-        
+
         LLAudioData *datap = gAudiop->getAudioData(sound_id);
 
         // Note that I don't actually do any loading of the
@@ -4467,7 +4459,7 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
         {
                 return;
         }*/
-        
+
         // Add audioData starts a transfer internally.
         sourcep->addAudioData(datap, FALSE);
 }
@@ -4495,12 +4487,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
                 // we don't know about this object, just bail
                 return;
         }
-        
+
         if (LLMuteList::getInstance()->isMuted(object_id)) return;
-        
+
         if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
 
-        
+
         // Don't play sounds from a region with maturity above current agent maturity
         // Actually, let's -- MC
         /*LLVector3d pos = objectp->getPositionGlobal();
@@ -4508,7 +4500,7 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
         {
                 return;
         }*/
-        
+
         objectp->setAttachedSound(sound_id, owner_id, gain, flags);
 }
 
@@ -4547,7 +4539,7 @@ void process_health_message(LLMessageSystem *mesgsys, void **user_data)
 
 
 void process_sim_stats(LLMessageSystem *msg, void **user_data)
-{       
+{
         S32 count = msg->getNumberOfBlocks("Stat");
         for (S32 i = 0; i < count; ++i)
         {
@@ -4696,7 +4688,7 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
                 BOOL was_flying = gAgent.getFlying();
                 regionp->setRegionFlags(region_flags);
                 regionp->setMaxTasks(max_tasks_per_region);
-                // HACK: This makes agents drop from the sky if the region is 
+                // HACK: This makes agents drop from the sky if the region is
                 // set to no fly while people are still in the sim.
                 if (was_flying && regionp->getBlockFly())
                 {
@@ -4713,7 +4705,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
         LLUUID  uuid;
         S32             anim_sequence_id;
         LLVOAvatar *avatarp;
-        
+
         mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
         //clear animation flags
@@ -4730,7 +4722,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
         S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
 
         avatarp->mSignaledAnimations.clear();
-        
+
         if (avatarp->isSelf())
         {
                 LLUUID object_id;
@@ -4740,7 +4732,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
                         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
                         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
 
-                        LL_DEBUGS("Messaging") << "Animation id " << animation_id 
+                        LL_DEBUGS("Messaging") << "Animation id " << animation_id
                                                                    << " from self using sequence id " << anim_sequence_id << LL_ENDL;
 
                         avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
@@ -4748,7 +4740,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
                         if (i < num_source_blocks)
                         {
                                 mesgsys->getUUIDFast(_PREHASH_AnimationSourceList, _PREHASH_ObjectID, object_id, i);
-                        
+
                                 LLViewerObject* object = gObjectList.findObject(object_id);
                                 if (object)
                                 {
@@ -4780,8 +4772,8 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
                         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
                         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
                         avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
-                        LL_DEBUGS("Messaging") << "Received animation id " << animation_id 
-                                                                   << " from " << uuid 
+                        LL_DEBUGS("Messaging") << "Received animation id " << animation_id
+                                                                   << " from " << uuid
                                                                    << " using sequence id " << anim_sequence_id << LL_ENDL;
                 }
         }
@@ -4856,7 +4848,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
         {
                 gAgent.setSitCamera(sitObjectID, camera_eye, camera_at);
         }
-        
+
         gAgent.mForceMouselook = force_mouselook;
 
         LLViewerObject* object = gObjectList.findObject(sitObjectID);
@@ -4952,7 +4944,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
                         LLFollowCamMgr::setFocusThreshold(source_id, value);
                         break;
                 case FOLLOWCAM_ACTIVE:
-                        //if 1, set using followcam,. 
+                        //if 1, set using followcam,.
                         LLFollowCamMgr::setCameraActive(source_id, value != 0.f);
                         break;
                 case FOLLOWCAM_POSITION_X:
@@ -5004,7 +4996,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
                 LLFollowCamMgr::setFocusOffset(source_id, focus_offset);
         }
 }
-//end Ventrella 
+//end Ventrella
 
 
 // Culled from newsim lltask.cpp
@@ -5196,7 +5188,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 bool handle_special_notification_callback(const LLSD& notification, const LLSD& response)
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
-        
+
         if (0 == option)
         {
                 // set the preference to the maturity of the region we're calling
@@ -5205,7 +5197,7 @@ bool handle_special_notification_callback(const LLSD& notification, const LLSD&
                 gAgent.sendMaturityPreferenceToServer(preferredMaturity);
 
         }
-        
+
         return false;
 }
 
@@ -5214,10 +5206,10 @@ bool handle_special_notification(std::string notificationID, LLSD& llsdBlock)
 {
         int regionAccess = llsdBlock["_region_access"].asInteger();
         llsdBlock["REGIONMATURITY"] = LLViewerRegion::accessToString(regionAccess);
-        
+
         // we're going to throw the LLSD in there in case anyone ever wants to use it
         LLNotifications::instance().add(notificationID+"_Notify", llsdBlock);
-        
+
         if (regionAccess == SIM_ACCESS_MATURE)
         {
                 if (gAgent.isTeen())
@@ -5266,7 +5258,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
                                 llwarns << "attempt_standard_notification: Attempted to read notification parameter data into LLSD but failed:" << llsdRaw << llendl;
                         }
                 }
-                
+
                 if (
                         (notificationID == "RegionEntryAccessBlocked") ||
                         (notificationID == "LandClaimAccessBlocked") ||
@@ -5277,32 +5269,32 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
                          (Commented so a grep will find the notification strings, since
                          we construct them on the fly; if you add additional notifications,
                          please update the comment.)
-                         
+
                          Could throw any of the following notifications:
-                         
+
                                 RegionEntryAccessBlocked
                                 RegionEntryAccessBlocked_Notify
                                 RegionEntryAccessBlocked_Change
                                 RegionEntryAccessBlocked_KB
-                                LandClaimAccessBlocked 
-                                LandClaimAccessBlocked_Notify 
-                                LandClaimAccessBlocked_Change 
-                                LandClaimAccessBlocked_KB 
+                                LandClaimAccessBlocked
+                                LandClaimAccessBlocked_Notify
+                                LandClaimAccessBlocked_Change
+                                LandClaimAccessBlocked_KB
                                 LandBuyAccessBlocked
                                 LandBuyAccessBlocked_Notify
                                 LandBuyAccessBlocked_Change
                                 LandBuyAccessBlocked_KB
-                         
-                        -----------------------------------------------------------------------*/ 
+
+                        -----------------------------------------------------------------------*/
                         if (handle_special_notification(notificationID, llsdBlock))
                         {
                                 return true;
                         }
                 }
-                
+
                 LLNotifications::instance().add(notificationID, llsdBlock);
                 return true;
-        }       
+        }
         return false;
 }
 
@@ -5312,7 +5304,7 @@ void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
         // make sure the cursor is back to the usual default since the
         // alert is probably due to some kind of error.
         gViewerWindow->getWindow()->resetBusyCount();
-        
+
         if (!attempt_standard_notification(msgsystem))
         {
                 BOOL modal = FALSE;
@@ -5333,7 +5325,7 @@ void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
         // make sure the cursor is back to the usual default since the
         // alert is probably due to some kind of error.
         gViewerWindow->getWindow()->resetBusyCount();
-                
+
         if (!attempt_standard_notification(msgsystem))
         {
                 BOOL modal = FALSE;
@@ -5462,7 +5454,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
 {
         if (gAgent.inPrelude())
         {
-                // In prelude, bumping is OK.  This dialog is rather confusing to 
+                // In prelude, bumping is OK.  This dialog is rather confusing to
                 // newbies, so we don't show it.  Drop the packet on the floor.
                 return;
         }
@@ -5519,7 +5511,7 @@ void process_frozen_message(LLMessageSystem *msgsystem, void **user_data)
         // alert is probably due to some kind of error.
         gViewerWindow->getWindow()->resetBusyCount();
         BOOL b_frozen;
-        
+
         msgsystem->getBOOL("FrozenData", "Data", b_frozen);
 
         // TODO: make being frozen change view
@@ -5538,8 +5530,8 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 
         S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
 
-        LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is " 
-                                << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() 
+        LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is "
+                                << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
                                 << upload_cost << LL_ENDL;
 
         LLFloaterImagePreview::setUploadAmount(upload_cost);
@@ -5562,13 +5554,13 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
         {
                 // check to see if the person we are asking
 
-                // "'[OBJECTNAME]', an object owned by '[OWNERNAME]', 
-                // located in [REGIONNAME] at [REGIONPOS], 
+                // "'[OBJECTNAME]', an object owned by '[OWNERNAME]',
+                // located in [REGIONNAME] at [REGIONPOS],
                 // has been <granted|denied> permission to: [PERMISSIONS]."
 
                 LLUIString notice(LLFloaterChat::getInstance()->getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
 
-                // always include the object name and owner name 
+                // always include the object name and owner name
                 notice.setArg("[OBJECTNAME]", notification["payload"]["object_name"].asString());
                 notice.setArg("[OWNERNAME]", notification["payload"]["owner_name"].asString());
 
@@ -5580,7 +5572,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
                 {
                         // found the viewerobject, get it's position in its region
                         LLVector3 objpos(viewobj->getPosition());
-                        
+
                         // try to lookup the name of the region the object is in
                         LLViewerRegion* viewregion = viewobj->getRegion();
                         if (viewregion)
@@ -5607,7 +5599,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
                         notice.setArg("[REGIONPOS]", "(unknown position)");
                 }
 
-                // check each permission that was requested, and list each 
+                // check each permission that was requested, and list each
                 // permission that has been flagged as a caution permission
                 BOOL caution = FALSE;
                 S32 count = 0;
@@ -5659,7 +5651,7 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
         {
                 new_questions = 0;
                 allowed = FALSE;
-        }       
+        }
 
         LLUUID task_id = notification["payload"]["task_id"].asUUID();
         LLUUID item_id = notification["payload"]["item_id"].asUUID();
@@ -5751,10 +5743,10 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
         {
                 throttle_name = taskid.getString();
         }
-        
+
         // don't display permission requests if this object is muted
         if (LLMuteList::getInstance()->isMuted(taskid)) return;
-        
+
         // throttle excessive requests from any specific user's scripts
         typedef LLKeyThrottle<std::string> LLStringThrottle;
         static LLStringThrottle question_throttle( LLREQUEST_PERMISSION_THROTTLE_LIMIT, LLREQUEST_PERMISSION_THROTTLE_INTERVAL );
@@ -5791,7 +5783,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
                         {
                                 LLStringUtil::format_map_t args;
                                 args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
-                                
+
                                 count++;
                                 script_question += "    " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args) + "\n";
 
@@ -6144,7 +6136,7 @@ void send_group_notice(const LLUUID& group_id,
         {
                 bucket_to_send = (U8*) EMPTY_BINARY_BUCKET;
         }
-   
+
 
         send_improved_im(
                         group_id,
@@ -6209,7 +6201,7 @@ void handle_lure(const LLUUID& invitee)
 }
 
 // Prompt for a message to the invited user.
-void handle_lure(LLDynamicArray<LLUUID>& ids) 
+void handle_lure(LLDynamicArray<LLUUID>& ids)
 {
         LLSD edit_args;
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a)
@@ -6254,7 +6246,7 @@ void send_improved_im(const LLUUID& to_id,
                                                         U8 offline,
                                                         EInstantMessage dialog,
                                                         const LLUUID& id,
-                                                        U32 timestamp, 
+                                                        U32 timestamp,
                                                         const U8* binary_bucket,
                                                         S32 binary_bucket_size)
 {
@@ -6313,7 +6305,7 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
                 LL_WARNS("Messaging") << "process_user_info_reply - "
                                 << "wrong agent id." << LL_ENDL;
         }
-        
+
         BOOL im_via_email;
         msg->getBOOLFast(_PREHASH_UserData, _PREHASH_IMViaEMail, im_via_email);
         std::string email;
@@ -6367,7 +6359,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
         LLSD payload;
 
-        std::string message; 
+        std::string message;
         std::string first_name;
         std::string last_name;
         std::string title;
@@ -6387,7 +6379,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
         {
                 std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
                 for (U32 i = 0; i < mutes.size(); i++)
-                {       
+                {
                         //this is almost like saying (mutes[i].mType != LLMute::Object), but more verbose ... -Kaku
                         if (
                                 ((mutes[i].mType == LLMute::AGENT)
@@ -6650,7 +6642,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
         // remove above two lines and replace with below line
         // to re-enable parcel browser for llMapDestination()
         // LLURLDispatcher::dispatch(LLURLDispatcher::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
-        
+
 }
 
 void process_covenant_reply(LLMessageSystem* msg, void**)
@@ -6683,7 +6675,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
         LLFloaterBuyLand::updateLastModified(last_modified);
 
         gCacheName->getName(estate_owner_id, callbackCacheEstateOwnerName);
-        
+
         // load the actual covenant asset data
         const BOOL high_priority = TRUE;
         if (covenant_id.notNull())
@@ -6721,7 +6713,7 @@ void callbackCacheEstateOwnerName(const LLUUID& id,
                                                                   BOOL is_group, void*)
 {
         std::string name;
-        
+
         if (id.isNull())
         {
                 name = "(none)";
@@ -6745,9 +6737,9 @@ void onCovenantLoadComplete(LLVFS *vfs,
         if(0 == status)
         {
                 LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
-                
+
                 S32 file_length = file.getSize();
-                
+
                 char* buffer = new char[file_length+1];
                 if (buffer == NULL)
                 {
@@ -6756,10 +6748,10 @@ void onCovenantLoadComplete(LLVFS *vfs,
                 }
 
                 file.read((U8*)buffer, file_length);            /* Flawfinder: ignore */
-                
+
                 // put a EOS at the end
                 buffer[file_length] = 0;
-                
+
                 if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
                 {
                         LLViewerTextEditor* editor =
@@ -6788,7 +6780,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
         else
         {
                 LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                
+
                 if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                     LL_ERR_FILE_EMPTY == status)
                 {
@@ -6802,7 +6794,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
                 {
                         covenant_text = "Unable to load estate covenant at this time.";
                 }
-                
+
                 LL_WARNS("Messaging") << "Problem loading notecard: " << status << LL_ENDL;
         }
         LLPanelEstateCovenant::updateCovenantText(covenant_text, asset_uuid);
@@ -6820,7 +6812,7 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**)
         msg->getStringFast(_PREHASH_FailureInfo,_PREHASH_ErrorMessage, messageText,0);
         msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_AgentID,agentID);
         msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_TransactionID,transactionID);
-        
+
         LL_WARNS("Messaging") << "Blacklisted Feature Response:" << messageText << LL_ENDL;
 }
 
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 576f312..880e1bb 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2046,9 +2046,6 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                                 if (HJT_HINGE == mJointInfo->mJointType)
                                 {
                                         // hinge = uniform circular motion
-                                        LLVector3 parent_pivot = getVelocity();
-                                        LLVector3 parent_axis = getAcceleration();
-        
                                         angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor);     // AxisOrAnchor = axis
                                         dQ.setQuat(angle, mJointInfo->mAxisOrAnchor);           // AxisOrAnchor = axis
                                         LLVector3 pivot_offset = pos - mJointInfo->mPivot;      // pos in pivot-frame
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 9b05470..98b7115 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -157,7 +157,13 @@ public:
         enum { MEDIA_TYPE_NONE = 0, MEDIA_TYPE_WEB_PAGE = 1 };
 
         // Return codes for processUpdateMessage
-        enum { MEDIA_URL_REMOVED = 0x1, MEDIA_URL_ADDED = 0x2, MEDIA_URL_UPDATED = 0x4, INVALID_UPDATE = 0x80000000 };
+        enum { 
+        MEDIA_URL_REMOVED = 0x1, 
+        MEDIA_URL_ADDED = 0x2, 
+        MEDIA_URL_UPDATED = 0x4, 
+        MEDIA_FLAGS_CHANGED = 0x8,
+        INVALID_UPDATE = 0x80000000
+    };
 
         virtual U32             processUpdateMessage(LLMessageSystem *mesgsys,
                                                                                 void **user_data,
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index ad92fe3..c82b1ae 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -288,7 +288,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 {
         LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS);        
         
-        LLVector3d camera_global = gAgent.getCameraPositionGlobal();
         LLViewerObject *objectp;
         S32                     num_objects;
         U32                     local_id;
@@ -305,28 +304,28 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
         if (!cached && !compressed && update_type != OUT_FULL)
         {
                 gTerseObjectUpdates += num_objects;
-                S32 size;
-                if (mesgsys->getReceiveCompressedSize())
-                {
-                        size = mesgsys->getReceiveCompressedSize();
-                }
-                else
-                {
-                        size = mesgsys->getReceiveSize();
-                }
+//              S32 size;
+//              if (mesgsys->getReceiveCompressedSize())
+//              {
+//                      size = mesgsys->getReceiveCompressedSize();
+//              }
+//              else
+//              {
+//                      size = mesgsys->getReceiveSize();
+//              }
 //              llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
         }
         else
         {
-                S32 size;
-                if (mesgsys->getReceiveCompressedSize())
-                {
-                        size = mesgsys->getReceiveCompressedSize();
-                }
-                else
-                {
-                        size = mesgsys->getReceiveSize();
-                }
+//              S32 size;
+//              if (mesgsys->getReceiveCompressedSize())
+//              {
+//                      size = mesgsys->getReceiveCompressedSize();
+//              }
+//              else
+//              {
+//                      size = mesgsys->getReceiveSize();
+//              }
 
 //              llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
                 gFullObjectUpdates += num_objects;
@@ -639,7 +638,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
                 mCurLazyUpdateIndex = 0;
         }
 
-        mCurBin = (++mCurBin) % NUM_BINS;
+        mCurBin = (mCurBin + 1) % NUM_BINS;
 
         LLVOAvatar::cullAvatarsByPixelArea();
 }
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 386a86e..a9ea1e6 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -101,12 +101,11 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
                                 sMediaRegionID = LLUUID() ;
                                 stop() ;
                                 LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL;
-                                return ;                                
+                                return ;
                         }
 
                         // we're in a parcel
-                        bool new_parcel = false;
-                        S32 parcelid = parcel->getLocalID();                                            
+                        S32 parcelid = parcel->getLocalID();
 
                         LLUUID regionid = gAgent.getRegion()->getRegionID();
                         if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID)
@@ -114,7 +113,6 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
                                 LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL;
                                 sMediaParcelLocalID = parcelid;
                                 sMediaRegionID = regionid;
-                                new_parcel = true;
                         }
 
                         std::string mediaUrl = std::string ( parcel->getMediaURL () );
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 2fafe30..42eb112 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1436,6 +1436,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("EstateChangeInfo");
         capabilityNames.append("EventQueueGet");
         capabilityNames.append("FetchInventory");
+        capabilityNames.append("ObjectMedia");
+        capabilityNames.append("ObjectMediaNavigate");
         capabilityNames.append("FetchLib");
         capabilityNames.append("FetchLibDescendents");
         capabilityNames.append("GetDisplayNames");
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index afd9b95..beec1f1 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -384,9 +384,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
         LLPointer<LLImageRaw> raw = new LLImageRaw(tex_width, tex_height, tex_comps);
         U8 *rawp = raw->getData();
 
-        F32 tex_width_inv = 1.f/tex_width;
-        F32 tex_height_inv = 1.f/tex_height;
-
         F32 st_x_stride, st_y_stride;
         st_x_stride = ((F32)st_width / (F32)mTexScaleX)*((F32)mWidth / (F32)tex_width);
         st_y_stride = ((F32)st_height / (F32)mTexScaleY)*((F32)mWidth / (F32)tex_height);
@@ -421,11 +418,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
                         tex1 = tex0 + 1;
                         tex1 = llclamp(tex1, 0, 3);
 
-                        F32 xy_int_i, xy_int_j;
-
-                        xy_int_i = i * tex_width_inv;
-                        xy_int_j = j * tex_height_inv;
-
                         st_offset = (lltrunc(sti) + lltrunc(stj)*st_width) * st_comps;
                         for (U32 k = 0; k < tex_comps; k++)
                         {
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 54f4942..812e924 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2500,7 +2500,6 @@ void LLVOAvatar::computeBodySize()
 
         // some of the joints have not been cached
         LLVector3 skull = mSkullp->getPosition();
-        LLVector3 skull_scale = mSkullp->getScale();
 
         LLVector3 neck = mNeckp->getPosition();
         LLVector3 neck_scale = mNeckp->getScale();
@@ -2580,7 +2579,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
 
-        LLVector3 old_vel = getVelocity();
         // Do base class updates...
         U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
 
@@ -3312,6 +3310,16 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
                         avatar_name_color = avatar_name_color * (F32)0.333333333333;
                         client = "Meerkat";
                 }
+                else if(idx == LLUUID("7eab0700-f000-0000-0000-546561706f74"))
+                {
+                        avatar_name_color = LLColor4(0.69f,0.42f,0.84f,1.0f); // Armins V3 viewer.
+                        client = "Teapot";
+                }
+                else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
+                {
+                        avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
+                        client = "Meta7";
+                }
                 else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
                 {
                         avatar_name_color += LLColor4::green;//emerald
@@ -3819,8 +3827,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                         mNameText->setLabel(mNameString);
                                 }
 
-                                char line[MAX_STRING];          /* Flawfinder: ignore */
-                                line[0] = '\0';
                                 std::deque<LLChat>::iterator chat_iter = mChats.begin();
                                 mNameText->clearString();
 
@@ -4283,8 +4289,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
         xyVel.mV[VZ] = 0.0f;
         speed = xyVel.length();
 
-        BOOL throttle = TRUE;
-
         if (!(mIsSitting && getParent()))
         {
                 //--------------------------------------------------------------------
@@ -4295,7 +4299,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                 if (mTimeLast == 0.0f)
                 {
                         mTimeLast = animation_time;
-                        throttle = FALSE;
 
                         // put the pelvis at slaved position/mRotation
                         mRoot.setWorldPosition( getPositionAgent() ); // first frame
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 559bc31..409bb68 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -3160,7 +3160,7 @@ void LLVoiceClient::giveUp()
 
 static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
 {
-        F32 nat[3], nup[3], nl[3], nvel[3]; // the new at, up, left vectors and the  new position and velocity
+        F32 nat[3], nup[3], nl[3]; // the new at, up, left vectors and the  new position and velocity (velocity was not used, so I deleted it)
         F64 npos[3];
         
         // The original XML command was sent like this:
@@ -3210,10 +3210,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
         npos[1] = pos.mdV[VZ];
         npos[2] = pos.mdV[VY];
 
-        nvel[0] = vel.mV[VX];
-        nvel[1] = vel.mV[VZ];
-        nvel[2] = vel.mV[VY];
-
         for(int i=0;i<3;++i) {
                 at.mV[i] = nat[i];
                 up.mV[i] = nup[i];
@@ -3264,10 +3260,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
         npos[1] = pos.mdV[VZ];
         npos[2] = pos.mdV[VY] * -1.0;
 
-        nvel[0] = vel.mV[VX];
-        nvel[1] = vel.mV[VZ];
-        nvel[2] = vel.mV[VY];
-
         for(int i=0;i<3;++i) {
                 at.mV[i] = nat[i];
                 up.mV[i] = nup[i];
diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index 1671880..380eff5 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -423,7 +423,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
         S32 vertex_count = 0;
         S32 i, x, y;
 
-        S32 num_vertices, num_indices;
+        S32 num_vertices;
 
         U32 render_stride = mLastStride;
         S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -441,7 +441,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
         if (north_stride == render_stride)
         {
                 num_vertices = 2 * length + 1;
-                num_indices = length * 6 - 3;
 
                 facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -494,7 +493,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
         {
                 // North stride is longer (has less vertices)
                 num_vertices = length + length/2 + 1;
-                num_indices = half_length*9 - 3;
 
                 facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -555,7 +553,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
                 length = patch_size / north_stride;
                 half_length = length / 2;
                 num_vertices = length + half_length + 1;
-                num_indices = 9*half_length - 3;
 
                 facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
 
@@ -629,7 +626,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 {
         S32 i, x, y;
 
-        S32 num_vertices, num_indices;
+        S32 num_vertices;
 
         U32 render_stride = mLastStride;
         S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -642,7 +639,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
         if (east_stride == render_stride)
         {
                 num_vertices = 2 * length + 1;
-                num_indices = length * 6 - 3;
 
                 facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -693,7 +689,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
         {
                 // East stride is longer (has less vertices)
                 num_vertices = length + half_length + 1;
-                num_indices = half_length*9 - 3;
 
                 facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -750,7 +745,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
                 length = patch_size / east_stride;
                 half_length = length / 2;
                 num_vertices = length + length/2 + 1;
-                num_indices = 9*(length/2) - 3;
 
                 facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index d580d61..2b9f94c 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -68,6 +68,9 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+#include "llmediaentry.h"
+#include "llmediadataclient.h"
+
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
@@ -79,6 +82,93 @@ F32 LLVOVolume::sLODFactor = 1.f;
 F32     LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
+LLPointer<LLObjectMediaDataClient> LLVOVolume::sObjectMediaClient = NULL;
+LLPointer<LLObjectMediaNavigateClient> LLVOVolume::sObjectMediaNavigateClient = NULL;
+
+// Implementation class of LLMediaDataClientObject.  See llmediadataclient.h
+class LLMediaDataClientObjectImpl : public LLMediaDataClientObject
+{
+public:
+        LLMediaDataClientObjectImpl(LLVOVolume *obj, bool isNew) : mObject(obj), mNew(isNew) {}
+        LLMediaDataClientObjectImpl() { mObject = NULL; }
+        
+        virtual U8 getMediaDataCount() const 
+                { return mObject->getNumTEs(); }
+
+        virtual LLSD getMediaDataLLSD(U8 index) const 
+                {
+                        LLSD result;
+                        LLTextureEntry *te = mObject->getTE(index); 
+                        if (NULL != te)
+                        {
+                                llassert((te->getMediaData() != NULL) == te->hasMedia());
+                                if (te->getMediaData() != NULL)
+                                {
+                                        result = te->getMediaData()->asLLSD();
+                                        // XXX HACK: workaround bug in asLLSD() where whitelist is not set properly
+                                        // See DEV-41949
+                                        if (!result.has(LLMediaEntry::WHITELIST_KEY))
+                                        {
+                                                result[LLMediaEntry::WHITELIST_KEY] = LLSD::emptyArray();
+                                        }
+                                }
+                        }
+                        return result;
+                }
+
+        virtual LLUUID getID() const
+                { return mObject->getID(); }
+
+        virtual void mediaNavigateBounceBack(U8 index)
+                { mObject->mediaNavigateBounceBack(index); } 
+        
+        virtual bool hasMedia() const
+                { return mObject->hasMedia();} 
+        
+        virtual void updateObjectMediaData(LLSD const &data, const std::string &version_string) 
+                { mObject->updateObjectMediaData(data, version_string); }
+        
+        virtual F64 getMediaInterest() const 
+                { 
+                        //F64 interest = mObject->getTotalMediaInterest();
+                        //FIXME
+                        F64 interest = 1024;
+                        if (interest < (F64)0.0)
+                        {
+                                // media interest not valid yet, try pixel area
+                                interest = mObject->getPixelArea();
+                                // HACK: force recalculation of pixel area if interest is the "magic default" of 1024.
+                                if (interest == 1024.f)
+                                {
+                                        const_cast<LLVOVolume*>(static_cast<LLVOVolume*>(mObject))->setPixelAreaAndAngle(gAgent);
+                                        interest = mObject->getPixelArea();
+                                }
+                        }
+                        return interest; 
+                }
+        
+        virtual bool isInterestingEnough() const
+                {
+                        return true; //FUCKEDUP --> LLViewerMedia::isInterestingEnough(mObject, getMediaInterest());
+                }
+
+        virtual std::string getCapabilityUrl(const std::string &name) const
+                { return mObject->getRegion()->getCapability(name); }
+        
+        virtual bool isDead() const
+                { return mObject->isDead(); }
+        
+        virtual U32 getMediaVersion() const
+                { return LLTextureEntry::getVersionFromMediaVersionString(mObject->getMediaURL()); }
+        
+        virtual bool isNew() const
+                { return mNew; }
+
+private:
+        LLPointer<LLVOVolume> mObject;
+        bool mNew;
+};
+
 
 LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
         : LLViewerObject(id, pcode, regionp),
@@ -123,6 +213,18 @@ void LLVOVolume::markDead()
 // static
 void LLVOVolume::initClass()
 {
+        // gSavedSettings better be around
+        if (gSavedSettings.getBOOL("PrimMediaMasterEnabled"))
+        {
+                const F32 queue_timer_delay = gSavedSettings.getF32("PrimMediaRequestQueueDelay");
+                const F32 retry_timer_delay = gSavedSettings.getF32("PrimMediaRetryTimerDelay");
+                const U32 max_retries = gSavedSettings.getU32("PrimMediaMaxRetries");
+                const U32 max_sorted_queue_size = gSavedSettings.getU32("PrimMediaMaxSortedQueueSize");
+                const U32 max_round_robin_queue_size = gSavedSettings.getU32("PrimMediaMaxRoundRobinQueueSize");
+
+                sObjectMediaClient = new LLObjectMediaDataClient(queue_timer_delay, retry_timer_delay, max_retries, 
+                                                                                                                         max_sorted_queue_size, max_round_robin_queue_size);
+        }
 }
 
 
@@ -132,6 +234,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                                                                                   LLDataPacker *dp)
 {
         LLColor4U color;
+        const S32 teDirtyBits = (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR|TEM_CHANGE_MEDIA);
 
         // Do base class updates...
         U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
@@ -199,10 +302,15 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                 //
                 // Unpack texture entry data
                 //
-                if (unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num) & (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR))
+                S32 result =unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num);
+                if (result & teDirtyBits)
                 {
                         updateTEData();
                 }
+                if (result & TEM_CHANGE_MEDIA)
+                {
+                        retval |= MEDIA_FLAGS_CHANGED;
+                }
         }
         else
         {
@@ -235,9 +343,16 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 //                              llerrs << "Bogus TE data in " << getID() << ", crashing!" << llendl;
                                 llwarns << "Bogus TE data in " << getID() << llendl;
                         }
-                        else if (res2 & (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR))
+                        else
                         {
-                                updateTEData();
+                                if (res2 & teDirtyBits) 
+                                {
+                                        updateTEData();
+                                }
+                                if (res2 & TEM_CHANGE_MEDIA)
+                                {
+                                        retval |= MEDIA_FLAGS_CHANGED;
+                                }
                         }
 
                         U32 value = dp->getPassFlags();
@@ -275,13 +390,39 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                                 U8                                                      tdpbuffer[1024];
                                 LLDataPackerBinaryBuffer        tdp(tdpbuffer, 1024);
                                 mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextureEntry, tdpbuffer, 0, block_num);
-                                if ( unpackTEMessage(tdp) & (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR))
+                                S32 result = unpackTEMessage(tdp);
+                                if (result & teDirtyBits)
                                 {
                                         updateTEData();
                                 }
+                                if (result & TEM_CHANGE_MEDIA)
+                                {
+                                        retval |= MEDIA_FLAGS_CHANGED;
+                                }
                         }
                 }
         }
+
+        if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED)) 
+        {
+                // If only the media URL changed, and it isn't a media version URL,
+                // ignore it
+                if ( ! ( retval & (MEDIA_URL_ADDED | MEDIA_URL_UPDATED) &&
+                                 mMedia && ! mMedia->mMediaURL.empty() &&
+                                 ! LLTextureEntry::isMediaVersionString(mMedia->mMediaURL) ) )
+                {
+                        // If the media changed at all, request new media data
+                        LL_DEBUGS("MediaOnAPrim") << "Media update: " << getID() << ": retval=" << retval << " Media URL: " <<
+                ((mMedia) ?  mMedia->mMediaURL : std::string("")) << LL_ENDL;
+                        requestMediaDataUpdate(retval & MEDIA_FLAGS_CHANGED);
+                }
+        else {
+            LL_INFOS("MediaOnAPrim") << "Ignoring media update for: " << getID() << " Media URL: " <<
+                ((mMedia) ?  mMedia->mMediaURL : std::string("")) << LL_ENDL;
+        }
+        }
+        // ...and clean up any media impls
+        cleanUpMediaImpls();
         
         return retval;
 }
@@ -2894,4 +3035,253 @@ void LLHUDPartition::shift(const LLVector3 &offset)
         //HUD objects don't shift with region crossing.  That would be silly.
 }
 
+void LLVOVolume::requestMediaDataUpdate(bool isNew)
+{
+    if (sObjectMediaClient)
+                sObjectMediaClient->fetchMedia(new LLMediaDataClientObjectImpl(this, isNew));
+}
+
+void LLVOVolume::cleanUpMediaImpls()
+{
+        // Iterate through our TEs and remove any Impls that are no longer used
+        const U8 numTEs = getNumTEs();
+        for (U8 i = 0; i < numTEs; i++)
+        {
+                const LLTextureEntry* te = getTE(i);
+                if( ! te->hasMedia())
+                {
+                        // Delete the media IMPL!
+                        removeMediaImpl(i) ;
+                }
+        }
+}
+
+void LLVOVolume::removeMediaImpl(S32 texture_index)
+{
+        if(mMediaImplList.size() <= (U32)texture_index || mMediaImplList[texture_index].isNull())
+        {
+                return ;
+        }
+
+        //make the face referencing to mMediaImplList[texture_index] to point back to the old texture.
+        if(mDrawable)
+        {
+                LLFace* facep = mDrawable->getFace(texture_index) ;
+                if(facep)
+                {
+                        //LLViewerMediaTexture* media_tex = LLViewerTextureManager::findMediaTexture(mMediaImplList[texture_index]->getMediaTextureID()) ;
+                        //if(media_tex)
+                        //{
+                        //      media_tex->removeMediaFromFace(facep) ;
+                        //}
+                }
+        }               
+        
+        //check if some other face(s) of this object reference(s)to this media impl.
+        S32 i ;
+        S32 end = (S32)mMediaImplList.size() ;
+        for(i = 0; i < end ; i++)
+        {
+                if( i != texture_index && mMediaImplList[i] == mMediaImplList[texture_index])
+                {
+                        break ;
+                }
+        }
+
+        if(i == end) //this object does not need this media impl.
+        {
+                //mMediaImplList[texture_index]->removeObject(this) ;
+        }
+
+        mMediaImplList[texture_index] = NULL ;
+        return ;
+}
+
+void LLVOVolume::addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index)
+{
+        if((S32)mMediaImplList.size() < texture_index + 1)
+        {
+                mMediaImplList.resize(texture_index + 1) ;
+        }
+        
+        if(mMediaImplList[texture_index].notNull())
+        {
+                if(mMediaImplList[texture_index] == media_impl)
+                {
+                        return ;
+                }
+
+                removeMediaImpl(texture_index) ;
+        }
+
+        mMediaImplList[texture_index] = media_impl;
+        //media_impl->addObject(this) ; 
+
+        //add the face to show the media if it is in playing
+        if(mDrawable)
+        {
+                LLFace* facep = mDrawable->getFace(texture_index) ;
+                if(facep)
+                {
+                        //LLViewerMediaTexture* media_tex = LLViewerTextureManager::findMediaTexture(mMediaImplList[texture_index]->getMediaTextureID()) ;
+                        //if(media_tex)
+                        //{
+                        //      media_tex->addMediaToFace(facep) ;
+                        //}
+                }
+                else //the face is not available now, start media on this face later.
+                {
+                        //media_impl->setUpdated(TRUE) ;
+                }
+        }
+        return ;
+}
+
+void LLVOVolume::sendMediaDataUpdate()
+{
+    if (sObjectMediaClient)
+                sObjectMediaClient->updateMedia(new LLMediaDataClientObjectImpl(this, false));
+}
+
+void LLVOVolume::updateObjectMediaData(const LLSD &media_data_array, const std::string &media_version)
+{
+        // media_data_array is an array of media entry maps
+        // media_version is the version string in the response.
+        U32 fetched_version = LLTextureEntry::getVersionFromMediaVersionString(media_version);
+
+        // Only update it if it is newer!
+        if ( (S32)fetched_version > mLastFetchedMediaVersion)
+        {
+                mLastFetchedMediaVersion = fetched_version;
+                //llinfos << "updating:" << this->getID() << " " << ll_pretty_print_sd(media_data_array) << llendl;
+                
+                LLSD::array_const_iterator iter = media_data_array.beginArray();
+                LLSD::array_const_iterator end = media_data_array.endArray();
+                U8 texture_index = 0;
+                for (; iter != end; ++iter, ++texture_index)
+                {
+                        syncMediaData(texture_index, *iter, false/*merge*/, false/*ignore_agent*/);
+                }
+        }
+}
+
+bool LLVOVolume::hasMedia() const
+{
+        bool result = false;
+        const U8 numTEs = getNumTEs();
+        for (U8 i = 0; i < numTEs; i++)
+        {
+                const LLTextureEntry* te = getTE(i);
+                if(te->hasMedia())
+                {
+                        result = true;
+                        break;
+                }
+        }
+        return result;
+}
+
+void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool merge, bool ignore_agent)
+{
+        if(mDead)
+        {
+                // If the object has been marked dead, don't process media updates.
+                return;
+        }
+        
+        LLTextureEntry *te = getTE(texture_index);
+//      LL_DEBUGS("MediaOnAPrim") << "BEFORE: texture_index = " << texture_index
+//              << " hasMedia = " << te->hasMedia() << " : " 
+//              << ((NULL == te->getMediaData()) ? "NULL MEDIA DATA" : ll_pretty_print_sd(te->getMediaData()->asLLSD())) << llendl;
 
+        std::string previous_url;
+        LLMediaEntry* mep = te->getMediaData();
+        if(mep)
+        {
+                // Save the "current url" from before the update so we can tell if
+                // it changes. 
+                previous_url = mep->getCurrentURL();
+        }
+
+        if (merge)
+        {
+                te->mergeIntoMediaData(media_data);
+        }
+        else {
+                // XXX Question: what if the media data is undefined LLSD, but the
+                // update we got above said that we have media flags??  Here we clobber
+                // that, assuming the data from the service is more up-to-date. 
+                te->updateMediaData(media_data);
+        }
+
+        mep = te->getMediaData();
+        if(mep)
+        {
+                //bool update_from_self = false;
+                if (!ignore_agent) 
+                {
+                        LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL());
+                        //update_from_self = (updating_agent == gAgent.getID());
+                }
+                //viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self);
+                        
+                //addMediaImpl(media_impl, texture_index) ;
+        }
+        else
+        {
+                //removeMediaImpl(texture_index);
+        }
+
+//      LL_DEBUGS("MediaOnAPrim") << "AFTER: texture_index = " << texture_index
+//              << " hasMedia = " << te->hasMedia() << " : " 
+//              << ((NULL == te->getMediaData()) ? "NULL MEDIA DATA" : ll_pretty_print_sd(te->getMediaData()->asLLSD())) << llendl;
+}
+
+
+void LLVOVolume::mediaNavigateBounceBack(U8 texture_index)
+{
+        /*
+        // Find the media entry for this navigate
+        const LLMediaEntry* mep = NULL;
+        viewer_media_t impl = getMediaImpl(texture_index);
+        LLTextureEntry *te = getTE(texture_index);
+        if(te)
+        {
+                mep = te->getMediaData();
+        }
+        
+        if (mep && impl)
+        {
+        std::string url = mep->getCurrentURL();
+                // Look for a ":", if not there, assume "http://"
+                if (!url.empty() && std::string::npos == url.find(':')) 
+                {
+                        url = "http://" + url;
+                }
+                // If the url we're trying to "bounce back" to is either empty or not
+                // allowed by the whitelist, try the home url.  If *that* doesn't work,
+                // set the media as failed and unload it
+        if (url.empty() || !mep->checkCandidateUrl(url))
+        {
+            url = mep->getHomeURL();
+                        // Look for a ":", if not there, assume "http://"
+                        if (!url.empty() && std::string::npos == url.find(':')) 
+                        {
+                                url = "http://" + url;
+                        }
+        }
+        if (url.empty() || !mep->checkCandidateUrl(url))
+                {
+                        // The url to navigate back to is not good, and we have nowhere else
+                        // to go.
+                        LL_WARNS("MediaOnAPrim") << "FAILED to bounce back URL \"" << url << "\" -- unloading impl" << LL_ENDL;
+                        impl->setMediaFailed(true);
+                }
+                else {
+                        // Okay, navigate now
+            LL_INFOS("MediaOnAPrim") << "bouncing back to URL: " << url << LL_ENDL;
+            impl->navigateTo(url, "", false, true);
+        }
+    }
+        */
+}
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index d09a198..39d9227 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -36,6 +36,8 @@
 #include "llviewerobject.h"
 #include "llviewerimage.h"
 #include "llframetimer.h"
+#include "llmediadataclient.h"
+#include "llviewermedia.h"
 #include "llapr.h"
 #include <map>
 
@@ -43,6 +45,8 @@ class LLViewerTextureAnim;
 class LLDrawPool;
 class LLSelectNode;
 
+typedef std::vector<viewer_media_t> media_list_t;
+
 enum LLVolumeInterfaceType
 {
         INTERFACE_FLEXIBLE = 1,
@@ -217,6 +221,46 @@ public:
 
         // tag: vaa emerald local_asset_browser
         void setSculptChanged(BOOL has_changed) { mSculptChanged = has_changed; }
+        
+ 
+           // Functions that deal with media, or media navigation
+     
+     // Update this object's media data with the given media data array
+     // (typically this is only called upon a response from a server request)
+        void updateObjectMediaData(const LLSD &media_data_array, const std::string &media_version);
+     
+     // Bounce back media at the given index to its current URL (or home URL, if current URL is empty)
+        void mediaNavigateBounceBack(U8 texture_index);
+     
+     // Returns whether or not this object has permission to navigate or control 
+        // the given media entry
+        enum MediaPermType {
+                MEDIA_PERM_INTERACT, MEDIA_PERM_CONTROL
+        };
+     bool hasMediaPermission(const LLMediaEntry* media_entry, MediaPermType perm_type);
+     
+        void mediaNavigated(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, std::string new_location);
+        void mediaEvent(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, LLViewerMediaObserver::EMediaEvent event);
+ 
+        // Sync the given media data with the impl and the given te
+        void syncMediaData(S32 te, const LLSD &media_data, bool merge, bool ignore_agent);
+        
+        // Send media data update to the simulator.
+        void sendMediaDataUpdate();
+ 
+        viewer_media_t getMediaImpl(U8 face_id) const;
+        S32 getFaceIndexWithMediaImpl(const LLViewerMediaImpl* media_impl, S32 start_face_id);
+        F64 getTotalMediaInterest() const;
+    
+        bool hasMedia() const;
+        
+        LLVector3 getApproximateFaceNormal(U8 face_id);
+        
+        // Returns 'true' iff the media data for this object is in flight
+        bool isMediaDataBeingFetched() const;
+        
+        // Returns the "last fetched" media version, or -1 if not fetched yet
+        S32 getLastFetchedMediaVersion() const { return mLastFetchedMediaVersion; }
                         
 protected:
         S32     computeLODDetail(F32    distance, F32 radius);
@@ -224,6 +268,11 @@ protected:
         LLFace* addFace(S32 face_index);
         void updateTEData();
 
+        void requestMediaDataUpdate(bool isNew);
+        void cleanUpMediaImpls();
+        void addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index) ;
+        void removeMediaImpl(S32 texture_index) ;
+
 public:
         LLViewerTextureAnim *mTextureAnimp;
         U8 mTexAnimMode;
@@ -242,12 +291,16 @@ private:
         LLVolumeInterface *mVolumeImpl;
         LLPointer<LLViewerImage> mSculptTexture;
         S32 mIndexInTex;                // index of this volume in the texture's volume list
+        media_list_t mMediaImplList;
+        S32                     mLastFetchedMediaVersion; // as fetched from the server, starts as -1
         
         // statics
 public:
         static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop 
         static F32 sLODFactor;                          // LOD scale factor
         static F32 sDistanceFactor;                     // LOD distance factor
+        static LLPointer<LLObjectMediaDataClient> sObjectMediaClient;
+        static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient;
                 
 protected:
         static S32 sNumLODChanges;
diff --git a/linden/indra/newview/llvowlsky.cpp b/linden/indra/newview/llvowlsky.cpp
index 572a2a1..5cbda97 100644
--- a/linden/indra/newview/llvowlsky.cpp
+++ b/linden/indra/newview/llvowlsky.cpp
@@ -719,12 +719,13 @@ void LLVOWLSky::updateStarColors()
 {
         std::vector<LLColor4>::iterator v_c = mStarColors.begin();
         std::vector<F32>::iterator v_i = mStarIntensities.begin();
-        std::vector<LLVector3>::iterator v_p = mStarVertices.begin();
+        // A bunch of stuff here is not used, but looks like it might be useful later, so I'll leave it, but commented out.
+        //std::vector<LLVector3>::iterator v_p = mStarVertices.begin();
 
         const F32 var = 0.15f;
         const F32 min = 0.5f; //0.75f;
-        const F32 sunclose_max = 0.6f;
-        const F32 sunclose_range = 1 - sunclose_max;
+        //const F32 sunclose_max = 0.6f;
+        //const F32 sunclose_range = 1 - sunclose_max;
 
         //F32 below_horizon = - llmin(0.0f, gSky.mVOSkyp->getToSunLast().mV[2]);
         //F32 brightness_factor = llmin(1.0f, below_horizon * 20);
@@ -738,14 +739,14 @@ void LLVOWLSky::updateStarColors()
                 U32 x;
                 for (x = 0; x < getStarsNumVerts(); ++x)
                 {
-                        F32 sundir_factor = 1;
-                        LLVector3 tostar = *v_p;
-                        tostar.normVec();
-                        const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSunLast();
-                        if (how_close_to_sun > sunclose_max)
-                        {
-                                sundir_factor = (1 - how_close_to_sun) / sunclose_range;
-                        }
+                        //F32 sundir_factor = 1;
+                        //LLVector3 tostar = *v_p;
+                        //tostar.normVec();
+                        //const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSunLast();
+                        //if (how_close_to_sun > sunclose_max)
+                        //{
+                        //      sundir_factor = (1 - how_close_to_sun) / sunclose_range;
+                        //}
                         intensity = *(v_i);
                         F32 alpha = v_c->mV[VALPHA] + (ll_frand() - 0.5f) * var * intensity;
                         if (alpha < min * intensity)
@@ -762,7 +763,7 @@ void LLVOWLSky::updateStarColors()
                         v_c->mV[VALPHA] = alpha;
                         v_c++;
                         v_i++;
-                        v_p++;
+                        //v_p++;
                 }
         }
 }
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index 0156622..2386631 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -3,9 +3,9 @@
  * @brief Implementation for the LLWaterParamManager class.
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-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
@@ -13,17 +13,17 @@
  * ("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.
@@ -69,6 +69,7 @@
 
 #include "llwlparammanager.h"
 #include "llwaterparamset.h"
+#include "llettherebelight.h"
 #include "llpostprocess.h"
 #include "llfloaterwater.h"
 
@@ -102,9 +103,9 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 {
         std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
         LL_DEBUGS2("AppInit", "ShaderLoading") << "Loading Default water settings from " << path_name << LL_ENDL;
-                        
-        bool found = true;                      
-        while(found) 
+
+        bool found = true;
+        while(found)
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
@@ -128,9 +129,9 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 
         std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
         LL_DEBUGS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL;
-                        
-        found = true;                   
-        while(found) 
+
+        found = true;
+        while(found)
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
@@ -159,7 +160,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
                 if(propagate)
                 {
                         getParamSet(name, mCurParams);
-                        propagateParameters();
+                        LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
                 }
                 return;
         }
@@ -174,10 +175,10 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
 
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
         LL_DEBUGS2("AppInit", "Shaders") << "Loading water settings from " << pathName << LL_ENDL;
-        
+
         std::ifstream presetsXML;
         presetsXML.open(pathName.c_str());
-        
+
         // That failed, try loading from the users area instead.
         if(!presetsXML)
         {
@@ -190,8 +191,8 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
         {
                 loadPresetXML(name, presetsXML);
                 presetsXML.close();
-        } 
-        else 
+        }
+        else
         {
                 llwarns << "Can't find " << name << llendl;
                 return;
@@ -200,21 +201,21 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
         if(propagate)
         {
                 getParamSet(name, mCurParams);
-                propagateParameters();
+                LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
         }
 }
 
 bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
 {
         LLSD paramsData(LLSD::emptyMap());
-        
+
         LLPointer<LLSDParser> parser = new LLSDXMLParser();
-        
+
         if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
         {
                 return false;
         }
-        
+
         if(check_if_real)
         {
                 static const char* expected_windlight_settings[] = {
@@ -240,17 +241,17 @@ bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& p
                         }
                 }
         }
-        
+
         std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
         if(mIt == mParamList.end())
         {
                 addParamSet(name, paramsData);
         }
-        else 
+        else
         {
                 setParamSet(name, paramsData);
         }
-        
+
         if(propagate)
         {
                 getParamSet(name, mCurParams);
@@ -306,19 +307,19 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
 {
         // make an empty llsd
         LLSD paramsData(LLSD::emptyMap());
-        
+
         // fill it with LLSD windlight params
         paramsData = mParamList[name].getAll();
-        
+
         // get some XML
         std::ostringstream presetsXML;
         LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
         formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
-        
+
         // Write it to a notecard
         LLNotecard notecard;
         notecard.setText(presetsXML.str());
-        
+
         LLInventoryItem *item = gInventory.getItem(mParamList[name].mInventoryID);
         if(!item)
         {
@@ -332,13 +333,13 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
                 LLAssetID asset_id;
                 tid.generate();
                 asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-                
+
                 LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
-                
+
                 std::ostringstream stream;
                 notecard.exportStream(stream);
                 std::string buffer = stream.str();
-                
+
                 S32 size = buffer.length() + 1;
                 file.setMaxSize(size);
                 file.write((U8*)buffer.c_str(), size);
@@ -351,7 +352,7 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
                 LL_WARNS("WindLight") << "Stuff the legacy system." << LL_ENDL;
                 return false;
         }
-        
+
         propagateParameters();
         return true;
 }
@@ -374,8 +375,8 @@ void LLWaterParamManager::propagateParameters(void)
         }
 
         bool err;
-        F32 fog_density_slider = 
-                log(mCurParams.getFloat(mFogDensity.mName, err)) / 
+        F32 fog_density_slider =
+                log(mCurParams.getFloat(mFogDensity.mName, err)) /
                 log(mFogDensity.mBase);
 
         setDensitySliderValue(fog_density_slider);
@@ -398,12 +399,12 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 void LLWaterParamManager::update(LLViewerCamera * cam)
 {
         LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-        
+
         // update the shaders and the menu
         propagateParameters();
-        
+
         // sync menus if they exist
-        if(LLFloaterWater::isOpen()) 
+        if(LLFloaterWater::isOpen())
         {
                 LLFloaterWater::instance()->syncMenu();
         }
@@ -411,12 +412,12 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
         stop_glerror();
 
         // only do this if we're dealing with shaders
-        if(gPipeline.canUseVertexShaders()) 
+        if(gPipeline.canUseVertexShaders())
         {
                 //transform water plane to eye space
                 glh::vec3f norm(0.f, 0.f, 1.f);
                 glh::vec3f p(0.f, 0.f, gAgent.getRegion()->getWaterHeight()+0.1f);
-                
+
                 F32 modelView[16];
                 for (U32 i = 0; i < 16; i++)
                 {
@@ -434,13 +435,13 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
                 mWaterPlane = LLVector4(enorm.v[0], enorm.v[1], enorm.v[2], -ep.dot(enorm));
 
                 LLVector3 sunMoonDir;
-                if (gSky.getSunDirection().mV[2] > NIGHTTIME_ELEVATION_COS)      
-                {        
-                        sunMoonDir = gSky.getSunDirection();     
-                }        
-                else     
-                {        
-                        sunMoonDir = gSky.getMoonDirection();    
+                if (gSky.getSunDirection().mV[2] > NIGHTTIME_ELEVATION_COS)
+                {
+                        sunMoonDir = gSky.getSunDirection();
+                }
+                else
+                {
+                        sunMoonDir = gSky.getMoonDirection();
                 }
                 sunMoonDir.normVec();
                 mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
@@ -510,8 +511,8 @@ bool LLWaterParamManager::addParamSet(const std::string& name, LLWaterParamSet&
 {
         // add a new one if not one there already
         std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt == mParamList.end()) 
-        {       
+        if(mIt == mParamList.end())
+        {
                 mParamList[name] = param;
                 return true;
         }
@@ -538,7 +539,7 @@ bool LLWaterParamManager::getParamSet(const std::string& name, LLWaterParamSet&
 {
         // find it and set it
         std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
         {
                 param = mParamList[name];
                 param.mName = name;
@@ -558,11 +559,11 @@ bool LLWaterParamManager::setParamSet(const std::string& name, LLWaterParamSet&
 bool LLWaterParamManager::setParamSet(const std::string& name, const LLSD & param)
 {
         // quick, non robust (we won't be working with files, but assets) check
-        if(!param.isMap()) 
+        if(!param.isMap())
         {
                 return false;
         }
-        
+
         mParamList[name].setAll(param);
 
         return true;
@@ -572,7 +573,7 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 {
         // remove from param list
         std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
         {
                 mParamList.erase(mIt);
         }
@@ -581,13 +582,13 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
         {
 
                 std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
-                
+
                 // use full curl escaped name
                 char * curl_str = curl_escape(name.c_str(), name.size());
                 std::string escaped_name(curl_str);
                 curl_free(curl_str);
                 curl_str = NULL;
-                
+
                 gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
         }
 
@@ -599,7 +600,7 @@ F32 LLWaterParamManager::getFogDensity(void)
         bool err;
 
         F32 fogDensity = mCurParams.getFloat("waterFogDensity", err);
-        
+
         // modify if we're underwater
         const F32 water_height = gAgent.getRegion() ? gAgent.getRegion()->getWaterHeight() : 0.f;
         F32 camera_height = gAgent.getCameraPositionAgent().mV[2];
@@ -659,7 +660,7 @@ void LLWaterParamManager::loadWaterNotecard(LLVFS *vfs, const LLUUID& asset_id,
                 }
                 else
                 {
-                        // We can do this because we know mCurParams 
+                        // We can do this because we know mCurParams
                         sInstance->mParamList[name].mInventoryID = inventory_id;
                 }
         }
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index 4b2e426..5825a23 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -192,8 +192,6 @@ LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error)
 LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) 
 {
         // test to see if right type
-        int ttest;
-        ttest = mParamValues.size();
         LLSD cur_val = mParamValues.get(paramName);
         if (!cur_val.isArray() || cur_val.size() != 2) 
         {
diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index efbad31..09da42b 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -47,12 +47,14 @@ class LLWaterParamSet;
 class LLWaterParamSet 
 {
         friend class LLWaterParamManager;
+        friend class LLWLParamManager;
+        friend class LightShare;
 
 public:
         std::string mName;
         LLUUID mInventoryID;
         
-private:
+protected:
 
         LLSD mParamValues;
 
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 8007cce..59de0ad 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -3,9 +3,9 @@
  * @brief Implementation for the LLWLParamManager class.
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-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
@@ -13,17 +13,17 @@
  * ("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.
@@ -33,6 +33,8 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llettherebelight.h"
 
 #include "pipeline.h"
 #include "llsky.h"
@@ -60,6 +62,7 @@
 #include "llfloaterdaycycle.h"
 #include "llfloaterenvsettings.h"
 
+#include "llworld.h"
 
 // For notecard loading
 #include "llvfile.h"
@@ -124,9 +127,9 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 {
         std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
         LL_DEBUGS2("AppInit", "ShaderLoading") << "Loading Default WindLight settings from " << path_name << LL_ENDL;
-                        
-        bool found = true;                      
-        while(found) 
+
+        bool found = true;
+        while(found)
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
@@ -150,9 +153,9 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 
         std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
         LL_INFOS2("AppInit", "Shaders") << "Loading User WindLight settings from " << path_name2 << LL_ENDL;
-                        
-        found = true;                   
-        while(found) 
+
+        found = true;
+        while(found)
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
@@ -176,14 +179,14 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 bool LLWLParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
 {
         LLSD paramsData(LLSD::emptyMap());
-        
+
         LLPointer<LLSDParser> parser = new LLSDXMLParser();
-        
+
         if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
         {
                 return false;
         }
-        
+
         if(check_if_real)
         {
                 static const char* expected_windlight_settings[] = {
@@ -220,13 +223,13 @@ bool LLWLParamManager::loadPresetXML(const std::string& name, std::istream& pres
                         }
                 }
         }
-        
+
         std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
         if(mIt == mParamList.end())
         {
                 addParamSet(name, paramsData);
         }
-        else 
+        else
         {
                 setParamSet(name, paramsData);
         }
@@ -258,12 +261,12 @@ void LLWLParamManager::savePresets(const std::string & fileName)
         //and not over the RO system wide version.
 
         LLSD paramsData(LLSD::emptyMap());
-        
+
         std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", fileName));
 
         for(std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.begin();
                 mIt != mParamList.end();
-                ++mIt) 
+                ++mIt)
         {
                 paramsData[mIt->first] = mIt->second.getAll();
         }
@@ -295,7 +298,7 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
         // Write it to a notecard
         LLNotecard notecard;
         notecard.setText(presetsXML.str());
- 
+
         LLInventoryItem *item = gInventory.getItem(mParamList[name].mInventoryID);
         if(!item)
         {
@@ -309,13 +312,13 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
                 LLAssetID asset_id;
                 tid.generate();
                 asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-                
+
                 LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
-                
+
                 std::ostringstream stream;
                 notecard.exportStream(stream);
                 std::string buffer = stream.str();
-                
+
                 S32 size = buffer.length() + 1;
                 file.setMaxSize(size);
                 file.write((U8*)buffer.c_str(), size);
@@ -328,7 +331,7 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
                 LL_WARNS("WindLight") << "Stuff the legacy system." << LL_ENDL;
                 return false;
         }
-        
+
         propagateParameters();
         return true;
 }
@@ -341,7 +344,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
                 if(propagate)
                 {
                         getParamSet(name, mCurParams);
-                        propagateParameters();
+                        LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
                 }
                 return;
         }
@@ -355,7 +358,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
         escaped_filename += ".xml";
 
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename));
-        LL_DEBUGS2("AppInit", "Shaders") << "Loading WindLight sky setting from " << pathName << LL_ENDL; 
+        LL_DEBUGS2("AppInit", "Shaders") << "Loading WindLight sky setting from " << pathName << LL_ENDL;
 
         llifstream presetsXML;
         presetsXML.open(pathName.c_str());
@@ -364,7 +367,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
         if(!presetsXML)
         {
                 pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", escaped_filename);
-                LL_DEBUGS2("AppInit", "Shaders")<< "Loading User WindLight sky setting from "  << LL_ENDL; 
+                LL_DEBUGS2("AppInit", "Shaders")<< "Loading User WindLight sky setting from "  << LL_ENDL;
                 presetsXML.open(pathName.c_str());
         }
 
@@ -372,22 +375,22 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
         {
                 loadPresetXML(name, presetsXML);
                 presetsXML.close();
-        } 
-        else 
+        }
+        else
         {
                 llwarns << "Can't find " << name << llendl;
                 return;
         }
 
-        
+
         if(propagate)
         {
                 getParamSet(name, mCurParams);
-                propagateParameters();
+                LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
         }
 
         notifyObservers();
-}       
+}
 
 void LLWLParamManager::savePreset(const std::string & name)
 {
@@ -427,7 +430,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
         {
                 shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
                 shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
-        } 
+        }
 
         else if (shader->mShaderGroup == LLGLSLShader::SG_SKY)
         {
@@ -435,13 +438,13 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
         }
 
         shader->uniform1f("scene_light_strength", mSceneLightStrength);
-        
+
 }
 
 void LLWLParamManager::propagateParameters(void)
 {
         LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-        
+
         LLVector4 sunDir;
         LLVector4 moonDir;
 
@@ -491,7 +494,7 @@ void LLWLParamManager::propagateParameters(void)
         // bind the variables for all shaders only if we're using WindLight
         LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
         end_shaders = LLViewerShaderMgr::instance()->endShaders();
-        for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter) 
+        for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
         {
                 if (shaders_iter->mProgramObject != 0
                         && (gPipeline.canUseWindLightShaders()
@@ -512,29 +515,29 @@ void LLWLParamManager::propagateParameters(void)
 void LLWLParamManager::update(LLViewerCamera * cam)
 {
         LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-        
+
         // update clouds, sun, and general
         mCurParams.updateCloudScrolling();
-        
+
         // update only if running
-        if(mAnimator.mIsRunning) 
+        if(mAnimator.mIsRunning)
         {
                 mAnimator.update(mCurParams);
         }
 
         // update the shaders and the menu
         propagateParameters();
-        
+
         // sync menus if they exist
-        if(LLFloaterWindLight::isOpen()) 
+        if(LLFloaterWindLight::isOpen())
         {
                 LLFloaterWindLight::instance()->syncMenu();
         }
-        if(LLFloaterDayCycle::isOpen()) 
+        if(LLFloaterDayCycle::isOpen())
         {
                 LLFloaterDayCycle::instance()->syncMenu();
         }
-        if(LLFloaterEnvSettings::isOpen()) 
+        if(LLFloaterEnvSettings::isOpen())
         {
                 LLFloaterEnvSettings::instance()->syncMenu();
         }
@@ -547,8 +550,8 @@ void LLWLParamManager::update(LLViewerCamera * cam)
         // executed some of the time.  For example for water shaders only.
         {
                 F32 camYawDelta = mSunDeltaYaw * DEG_TO_RAD;
-                
-                LLVector3 lightNorm3(mLightDir);        
+
+                LLVector3 lightNorm3(mLightDir);
                 lightNorm3 *= LLQuaternion(-(camYaw + camYawDelta), LLVector3(0.f, 1.f, 0.f));
                 mRotatedLightDir = LLVector4(lightNorm3, 0.f);
 
@@ -621,7 +624,7 @@ void LLWLParamManager::cleanupClass()
 
 void LLWLParamManager::resetAnimator(F32 curTime, bool run)
 {
-        mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate, 
+        mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate,
                 curTime, run);
 
         return;
@@ -630,8 +633,8 @@ bool LLWLParamManager::addParamSet(const std::string& name, LLWLParamSet& param)
 {
         // add a new one if not one there already
         std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt == mParamList.end()) 
-        {       
+        if(mIt == mParamList.end())
+        {
                 mParamList[name] = param;
                 return true;
         }
@@ -658,7 +661,7 @@ bool LLWLParamManager::getParamSet(const std::string& name, LLWLParamSet& param)
 {
         // find it and set it
         std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
         {
                 param = mParamList[name];
                 param.mName = name;
@@ -678,11 +681,11 @@ bool LLWLParamManager::setParamSet(const std::string& name, LLWLParamSet& param)
 bool LLWLParamManager::setParamSet(const std::string& name, const LLSD & param)
 {
         // quick, non robust (we won't be working with files, but assets) check
-        if(!param.isMap()) 
+        if(!param.isMap())
         {
                 return false;
         }
-        
+
         mParamList[name].setAll(param);
 
         return true;
@@ -692,7 +695,7 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 {
         // remove from param list
         std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
         {
                 mParamList.erase(mIt);
         }
@@ -701,11 +704,11 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 
         // remove all references
         bool stat = true;
-        do 
+        do
         {
                 // get it
                 stat = mDay.getKey(name, key);
-                if(stat == false) 
+                if(stat == false)
                 {
                         break;
                 }
@@ -714,17 +717,17 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
                 stat = mDay.removeKey(key);
 
         } while(stat == true);
-        
+
         if(delete_from_disk)
         {
                 std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
-                
+
                 // use full curl escaped name
                 char * curl_str = curl_escape(name.c_str(), name.size());
                 std::string escaped_name(curl_str);
                 curl_free(curl_str);
                 curl_str = NULL;
-                
+
                 gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
         }
 
@@ -797,7 +800,7 @@ void LLWLParamManager::loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id,
                 }
                 else
                 {
-                        // We can do this because we know mCurParams 
+                        // We can do this because we know mCurParams
                         sInstance->mParamList[name].mInventoryID = inventory_id;
                 }
         }
@@ -836,3 +839,21 @@ void LLWLParamManager::notifyObservers()
                 observer->changed();
         }
 }
+
+// static
+bool LLWLParamManager::isWaterSettingsNotecard(std::string name)
+{
+        return (name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") == 0);
+}
+
+// static
+bool LLWLParamManager::isSkySettingsNotecard(std::string name)
+{
+        return (name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") == 0);
+}
+
+// static
+bool LLWLParamManager::isSettingsNotecard(std::string name)
+{
+        return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
+}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index fc1127e..034b2e6 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -3,9 +3,9 @@
  * @brief Implementation for the LLWLParamManager class.
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-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
@@ -13,17 +13,17 @@
  * ("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.
@@ -36,6 +36,7 @@
 #include <vector>
 #include <map>
 #include "llwlparamset.h"
+#include "llwaterparamset.h"
 #include "llwlanimator.h"
 #include "llwldaycycle.h"
 #include "llviewercamera.h"
@@ -51,10 +52,10 @@ public:
         virtual ~LLWLPresetsObserver() { };
         virtual void changed() = 0;
 };
- 
+
 // color control
 struct WLColorControl {
-        
+
         F32 r, g, b, i;                         /// the values
         std::string mName;                      /// name to use to dereference params
         std::string mSliderName;        /// name of the slider in menu
@@ -88,7 +89,7 @@ struct WLColorControl {
                 r = val.mV[0];
                 g = val.mV[1];
                 b = val.mV[2];
-                i = val.mV[3];          
+                i = val.mV[3];
                 return *this;
         }
 
@@ -131,6 +132,7 @@ struct WLFloatControl {
         }
 };
 
+
 /// WindLight parameter manager class - what controls all the wind light shaders
 class LLWLParamManager
 {
@@ -151,19 +153,19 @@ public:
         /// load an individual preset into the sky from an LLSD stream
         /// Returns whether the stream was actually reasonable XML to load from.
         bool loadPresetXML(const std::string& name, std::istream& preset_stream, bool propogate=false, bool check_if_real=false);
-        
+
         /// Load an individual preset from a notecard.
         void loadPresetNotecard(const std::string& name, const LLUUID& asset_id, const LLUUID& inv_id);
-        
+
         /// save the parameter presets to file
         void savePreset(const std::string & name);
-        
+
         /// save the parameter presets to file
         bool savePresetToNotecard(const std::string & name);
 
         /// Set shader uniforms dirty, so they'll update automatically.
         void propagateParameters(void);
-        
+
         /// Update shader uniforms that have changed.
         void updateShaderUniforms(LLGLSLShader * shader);
 
@@ -181,7 +183,7 @@ public:
 
         // get where the light is pointing
         inline LLVector4 getRotatedLightDir(void) const;
-        
+
         /// get the dome's offset
         inline F32 getDomeOffset(void) const;
 
@@ -193,7 +195,7 @@ public:
 
         // Cleanup of global data that's only inited once per class.
         static void cleanupClass();
-        
+
         /// add a param to the list
         bool addParamSet(const std::string& name, LLWLParamSet& param);
 
@@ -205,9 +207,9 @@ public:
 
         /// set the param in the list with a new param
         bool setParamSet(const std::string& name, LLWLParamSet& param);
-        
+
         /// set the param in the list with a new param
-        bool setParamSet(const std::string& name, LLSD const & param);  
+        bool setParamSet(const std::string& name, LLSD const & param);
 
         /// gets rid of a parameter and any references to it
         /// returns true if successful
@@ -223,6 +225,11 @@ public:
 
         void SetMixTime(LLWLParamSet* mixSet, F32 mixTime);
 
+        // Notecard settings checkers.
+        static bool isWaterSettingsNotecard(std::string name);
+        static bool isSkySettingsNotecard(std::string name);
+        static bool isSettingsNotecard(std::string name);
+
 public:
 
         // helper variables
@@ -249,7 +256,7 @@ public:
         WLFloatControl mWLGamma;
 
         F32 mSceneLightStrength;
-        
+
         /// Atmospherics
         WLColorControl mBlueHorizon;
         WLColorControl mHazeDensity;
@@ -275,10 +282,10 @@ public:
         /// sky dome
         F32 mDomeOffset;
         F32 mDomeRadius;
-        
+
         // list of all the parameters, listed by name
-        std::map<std::string, LLWLParamSet> mParamList; 
-        
+        std::map<std::string, LLWLParamSet> mParamList;
+
 private:
         // our parameter manager singleton instance
         static LLWLParamManager * sInstance;
@@ -287,11 +294,10 @@ private:
         LLWLParamSet* sMixSet;
         F32 sMixTime;
         F32 sMixCount;
-        
+
         static std::vector<LLWLPresetsObserver*> sObservers;
 
         static void loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id, LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
-
 };
 
 inline F32 LLWLParamManager::getDomeOffset(void) const
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index 038490d..ce01f84 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -3,9 +3,9 @@
  * @brief Interface for the LLWLParamSet class.
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
+ *
  * Copyright (c) 2005-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
@@ -13,17 +13,17 @@
  * ("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.
@@ -46,16 +46,16 @@ class LLWLParamSet;
 /// A class representing a set of parameter values for the WindLight shaders.
 class LLWLParamSet {
 
-        friend class LLWLParamManager;
+        friend class LightShare;
 
 public:
         std::string mName;
         LLUUID mInventoryID;
-        
-private:
+
+protected:
 
         LLSD mParamValues;
-        
+
         float mCloudScrollXOffset, mCloudScrollYOffset;
 
 public:
@@ -67,10 +67,10 @@ public:
 
         /// set the total llsd
         void setAll(const LLSD& val);
-        
+
         /// get the total llsd
-        const LLSD& getAll();           
-        
+        const LLSD& getAll();
+
 
         /// Set a float parameter.
         /// \param paramName    The name of the parameter to set.
@@ -120,61 +120,61 @@ public:
 
         /// Get an integer parameter
         /// \param paramName    The name of the parameter to set.
-        /// \param error                A flag to set if it's not the proper return type        
+        /// \param error                A flag to set if it's not the proper return type
         F32 getFloat(const std::string& paramName, bool& error);
-        
-        
+
+
         // specific getters and setters
-        
-        
+
+
         /// set the star's brightness
         /// \param val brightness value
         void setStarBrightness(F32 val);
-        
+
         /// get the star brightness value;
-        F32 getStarBrightness();        
-        
+        F32 getStarBrightness();
+
         void setSunAngle(F32 val);
-        F32 getSunAngle();      
-        
+        F32 getSunAngle();
+
         void setEastAngle(F32 val);
-        F32 getEastAngle();     
-        
-                                                        
-        
+        F32 getEastAngle();
+
+
+
         /// set the cloud scroll x enable value
-        /// \param val scroll x value   
+        /// \param val scroll x value
         void setEnableCloudScrollX(bool val);
 
-        /// get the scroll x enable value;      
+        /// get the scroll x enable value;
         bool getEnableCloudScrollX();
-        
+
         /// set the star's brightness
-        /// \param val scroll y bool value              
-        void setEnableCloudScrollY(bool val);   
+        /// \param val scroll y bool value
+        void setEnableCloudScrollY(bool val);
 
         /// get the scroll enable y value;
         bool getEnableCloudScrollY();
-        
+
         /// set the cloud scroll x enable value
-        /// \param val scroll x value   
+        /// \param val scroll x value
         void setCloudScrollX(F32 val);
 
-        /// get the scroll x enable value;      
+        /// get the scroll x enable value;
         F32 getCloudScrollX();
-        
+
         /// set the star's brightness
-        /// \param val scroll y bool value              
-        void setCloudScrollY(F32 val);  
+        /// \param val scroll y bool value
+        void setCloudScrollY(F32 val);
 
         /// get the scroll enable y value;
-        F32 getCloudScrollY();  
+        F32 getCloudScrollY();
 
         /// interpolate two parameter sets
         /// \param src                  The parameter set to start with
         /// \param dest                 The parameter set to end with
         /// \param weight               The amount to interpolate
-        void mix(LLWLParamSet& src, LLWLParamSet& dest, 
+        void mix(LLWLParamSet& src, LLWLParamSet& dest,
                 F32 weight);
 
         void updateCloudScrolling(void);
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index d7a6838..b2cab52 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -1192,8 +1192,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
         S32 text_x = x;
         S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight());
 
-        BOOL is_in_window = true;
-
         if(    x < 0 
                 || y < 0 
                 || x >= getRect().getWidth() 
@@ -1206,7 +1204,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
                         text_x = sTrackingArrowX;
                         text_y = sTrackingArrowY;
                 }
-                is_in_window = false;
         }
         else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION &&
                 LLTracker::getTrackedLocationType() != LLTracker::LOCATION_NOTHING)
diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
index 1ebe727..5b4a12e 100644
--- a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence 1.4.0 beta 1";
-CFBundleGetInfoString = "Imprudence 1.4.0 beta 1";
+CFBundleName = "meta-impy";
+CFBundleShortVersionString = "meta-impy 1.4.0.3 exp 1";
+CFBundleGetInfoString = "meta-impy 1.4.0.3 exp 1";
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index c94c0d1..ad6efc2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -408,7 +408,6 @@ void PanelRadar::updateButtonStates()
         static bool enable_unmute = false;
         static bool enable_track = false;
         static bool enable_estate = false;
-        static bool enable_friend = false;
         static bool enable_cam = false;
 
         if (mRadarTabs->getCurrentPanelIndex() == 0) // Avatar tab
@@ -426,7 +425,6 @@ void PanelRadar::updateButtonStates()
                 enable_estate = isKickable(mSelectedAvatar);
                 enable_unmute = LLMuteList::getInstance()->isMuted(mSelectedAvatar);
                 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-                enable_friend = !is_agent_friend(mSelectedAvatar);
                 enable_cam = mSelectedDistance >= 0 && mSelectedDistance <= gSavedSettings.getF32("NearMeRange");
         }
         else
@@ -436,7 +434,6 @@ void PanelRadar::updateButtonStates()
                 enable_estate = false;
                 enable_unmute = false;
                 enable_track = false;
-                enable_friend = false;
                 enable_cam = false;
         }
 
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index e2d9f85..a13a605 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -232,6 +232,7 @@ BOOL	LLPipeline::sPickAvatar = TRUE;
 BOOL    LLPipeline::sDynamicLOD = TRUE;
 BOOL    LLPipeline::sShowHUDAttachments = TRUE;
 BOOL    LLPipeline::sRenderPhysicalBeacons = TRUE;
+BOOL    LLPipeline::sRenderMOAPBeacons = FALSE;
 BOOL    LLPipeline::sRenderScriptedBeacons = FALSE;
 BOOL    LLPipeline::sRenderScriptedTouchBeacons = TRUE;
 BOOL    LLPipeline::sRenderParticleBeacons = FALSE;
@@ -2167,6 +2168,43 @@ void renderPhysicalBeacons(LLDrawable* drawablep)
         }
 }
 
+void renderMOAPBeacons(LLDrawable* drawablep)
+{
+        LLViewerObject *vobj = drawablep->getVObj();
+
+        if(!vobj || vobj->isAvatar())
+                return;
+
+        BOOL beacon=FALSE;
+        U8 tecount=vobj->getNumTEs();
+        for(int x=0;x<tecount;x++)
+        {
+                if(vobj->getTE(x)->hasMedia())
+                {
+                        beacon=TRUE;
+                        break;
+                }
+        }
+        if(beacon==TRUE)
+        {
+                if (gPipeline.sRenderBeacons)
+                {
+                        gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(0.f, 1.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f), gSavedSettings.getS32("DebugBeaconLineWidth"));
+                }
+
+                if (gPipeline.sRenderHighlight)
+                {
+                        S32 face_id;
+                        S32 count = drawablep->getNumFaces();
+                        for (face_id = 0; face_id < count; face_id++)
+                        {
+                                gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) );
+                        }
+                }
+        }
+}
+
+
 void renderParticleBeacons(LLDrawable* drawablep)
 {
         // Look for attachments, objects, etc.
@@ -2249,18 +2287,12 @@ void LLPipeline::postSort(LLCamera& camera)
         const S32 bin_count = 1024*8;
                 
         static LLCullResult::drawinfo_list_t alpha_bins[bin_count];
-        static U32 bin_size[bin_count];
 
         //clear one bin per frame to avoid memory bloat
         static S32 clear_idx = 0;
         clear_idx = (1+clear_idx)%bin_count;
         alpha_bins[clear_idx].clear();
 
-        for (U32 j = 0; j < bin_count; j++)
-        {
-                bin_size[j] = 0;
-        }
-
         //build render map
         for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
         {
@@ -2347,6 +2379,11 @@ void LLPipeline::postSort(LLCamera& camera)
                         forAllVisibleDrawables(renderPhysicalBeacons);
                 }
 
+                if(sRenderMOAPBeacons)
+                {
+                        forAllVisibleDrawables(renderMOAPBeacons);
+                }
+
                 if (sRenderParticleBeacons)
                 {
                         forAllVisibleDrawables(renderParticleBeacons);
@@ -4581,6 +4618,24 @@ BOOL LLPipeline::getRenderScriptedTouchBeacons(void*)
 }
 
 // static
+void LLPipeline::setRenderMOAPBeacons(BOOL val)
+{
+        sRenderMOAPBeacons = val;
+}
+
+// static
+void LLPipeline::toggleRenderMOAPBeacons(void*)
+{
+        sRenderMOAPBeacons = !sRenderMOAPBeacons;
+}
+
+// static
+BOOL LLPipeline::getRenderMOAPBeacons(void*)
+{
+        return sRenderMOAPBeacons;
+}
+
+// static
 void LLPipeline::setRenderPhysicalBeacons(BOOL val)
 {
         sRenderPhysicalBeacons = val;
@@ -5913,8 +5968,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
                         stop_glerror();
 
-                        LLVector3 origin = camera.getOrigin();
-
                         glPushMatrix();
 
                         mat.set_scale(glh::vec3f(1,1,-1));
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index c5ab7ab..254b3c1 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -271,6 +271,10 @@ public:
         static void toggleRenderPhysicalBeacons(void* data);
         static BOOL getRenderPhysicalBeacons(void* data);
 
+        static void setRenderMOAPBeacons(BOOL val);
+        static void toggleRenderMOAPBeacons(void * data);
+        static BOOL getRenderMOAPBeacons(void * data);
+
         static void setRenderScriptedBeacons(BOOL val);
         static void toggleRenderScriptedBeacons(void* data);
         static BOOL getRenderScriptedBeacons(void* data);
@@ -572,6 +576,7 @@ protected:
         S32                                             mLightingDetail;
                 
         static BOOL                             sRenderPhysicalBeacons;
+        static BOOL                             sRenderMOAPBeacons;
         static BOOL                             sRenderScriptedTouchBeacons;
         static BOOL                             sRenderScriptedBeacons;
         static BOOL                             sRenderParticleBeacons;
diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
index 3fe31f7..b4944fe 100644
--- a/linden/indra/newview/qtoolalign.cpp
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -36,7 +36,7 @@ const F32 MANIPULATOR_SELECT_SIZE = 20.0;
 
 
 QToolAlign::QToolAlign()
-:       LLTool(std::string("Align"))
+:       LLToolComposite(std::string("Align"))
 {
 }
 
@@ -46,7 +46,6 @@ QToolAlign::~QToolAlign()
 }
 
 
-
 BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         if (mHighlightedAxis != -1)
@@ -62,6 +61,11 @@ BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 
 
+BOOL QToolAlign::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+        return TRUE;
+}
+
 
 void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 {
@@ -95,7 +99,7 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
         }
         else
         {
-                if (!(pick_info.mKeyMask == MASK_SHIFT))
+                if (!(pick_info.mKeyMask & MASK_SHIFT))
                 {
                         LLSelectMgr::getInstance()->deselectAll();
                 }
@@ -105,7 +109,6 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 }
 
 
-
 void QToolAlign::handleSelect()
 {
         // no parts, please
@@ -207,7 +210,6 @@ BOOL QToolAlign::handleHover(S32 x, S32 y, MASK mask)
 }
 
 
-
 void setup_transforms_bbox(LLBBox bbox)
 {
         // translate to center
@@ -242,6 +244,7 @@ void render_bbox(LLBBox bbox)
         gGL.popMatrix();
 }
 
+
 void render_cone_bbox(LLBBox bbox)
 {
         glMatrixMode(GL_MODELVIEW);
@@ -256,7 +259,6 @@ void render_cone_bbox(LLBBox bbox)
 }
 
 
-
 // the selection bbox isn't axis aligned, so we must construct one
 // should this be cached in the selection manager?  yes.
 LLBBox get_selection_axis_aligned_bbox()
@@ -288,7 +290,6 @@ LLBBox get_selection_axis_aligned_bbox()
 }
 
 
-
 void QToolAlign::computeManipulatorSize()
 {
         if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
@@ -407,6 +408,7 @@ void QToolAlign::render()
         }
 }
 
+
 // only works for our specialized (AABB, position centered) bboxes
 BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
 {
@@ -422,7 +424,6 @@ BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
 }
 
 
-
 // used to sort bboxes before packing
 class BBoxCompare
 {
@@ -598,5 +599,3 @@ void QToolAlign::align()
         
         LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
 }
-
-
diff --git a/linden/indra/newview/qtoolalign.h b/linden/indra/newview/qtoolalign.h
index b2c18b7..2d30b92 100644
--- a/linden/indra/newview/qtoolalign.h
+++ b/linden/indra/newview/qtoolalign.h
@@ -13,6 +13,7 @@
 #define Q_QTOOLALIGN_H
 
 #include "lltool.h"
+#include "lltoolcomp.h"
 #include "llbbox.h"
 
 class LLViewerObject;
@@ -20,7 +21,7 @@ class LLPickInfo;
 class LLToolSelectRect;
 
 class QToolAlign
-:       public LLTool, public LLSingleton<QToolAlign>
+:       public LLToolComposite, public LLSingleton<QToolAlign>
 {
 public:
         QToolAlign();
@@ -29,6 +30,7 @@ public:
         virtual void    handleSelect();
         virtual void    handleDeselect();
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual void    render();
 
diff --git a/linden/indra/newview/rcmoapradar.cpp b/linden/indra/newview/rcmoapradar.cpp
new file mode 100644
index 0000000..f0593ef
--- /dev/null
+++ b/linden/indra/newview/rcmoapradar.cpp
@@ -0,0 +1,440 @@
+// MOAP Radar
+// Robin Cornelius
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llavatarconstants.h"
+#include "llfloateravatarlist.h"
+
+#include "lluictrlfactory.h"
+#include "llviewerwindow.h"
+#include "llscrolllistctrl.h"
+#include "llradiogroup.h"
+#include "llviewercontrol.h"
+#include "llbutton.h"
+
+#include "llvoavatar.h"
+#include "llimview.h"
+#include "rcmoapradar.h"
+#include "llregionflags.h"
+#include "llfloaterreporter.h"
+#include "llagent.h"
+#include "llviewerregion.h"
+#include "lltracker.h"
+#include "llviewerstats.h"
+#include "llerror.h"
+#include "llchat.h"
+#include "llfloaterchat.h"
+#include "llviewermessage.h"
+#include "llweb.h"
+#include "llviewerobjectlist.h"
+#include "llmutelist.h"
+#include "llcallbacklist.h"
+#include "llmediaentry.h"
+
+#include <time.h>
+#include <string.h>
+
+#include <map>
+
+#include "llworld.h"
+
+#include "llsdutil.h"
+
+LLFloaterMOAPRadar* LLFloaterMOAPRadar::sInstance = NULL;
+
+LLFloaterMOAPRadar::LLFloaterMOAPRadar() :  LLFloater(std::string("MOAPradar"))
+{
+        llassert_always(sInstance == NULL);
+        sInstance = this;
+        mUpdateRate = gSavedSettings.getU32("MOAPRadarUpdateRate") * 3 + 3;
+        mTrackingRunning=false;
+}
+
+LLFloaterMOAPRadar::~LLFloaterMOAPRadar()
+{
+        gIdleCallbacks.deleteFunction(LLFloaterMOAPRadar::callbackIdle);
+        sInstance = NULL;
+}
+
+//static
+void LLFloaterMOAPRadar::toggle(void*)
+{
+        if (sInstance)
+        {
+                if (sInstance->getVisible())
+                {
+                        sInstance->close(false);
+                }
+                else
+                {
+                        sInstance->open();
+                }
+        }
+        else
+        {
+                showInstance();
+        }
+}
+
+//static
+void LLFloaterMOAPRadar::showInstance()
+{
+        if (sInstance)
+        {
+                if (!sInstance->getVisible())
+                {
+                        sInstance->open();
+                }
+        }
+        else
+        {
+                sInstance = new LLFloaterMOAPRadar();
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_moap_radar.xml");
+        }
+}
+
+void LLFloaterMOAPRadar::draw()
+{
+        LLFloater::draw();
+}
+
+void LLFloaterMOAPRadar::onOpen()
+{
+        gSavedSettings.setBOOL("ShowMOAPRadar", TRUE);
+        sInstance->setVisible(TRUE);
+}
+
+void LLFloaterMOAPRadar::onClose(bool app_quitting)
+{
+        sInstance->setVisible(FALSE);
+        if (!app_quitting)
+        {
+                gSavedSettings.setBOOL("ShowMOAPRadar", FALSE);
+        }
+        if (!gSavedSettings.getBOOL("MOAPRadarKeepOpen") || app_quitting)
+        {
+                destroy();
+        }
+}
+
+
+BOOL LLFloaterMOAPRadar::postBuild()
+{
+
+        mMOAPList = getChild<LLScrollListCtrl>("moap_list");
+        mMOAPList->sortByColumn("distance", TRUE);
+
+        mTrackBtn = getChild<LLButton>("track_btn");
+        mTrackBtn->setLabel(LLStringExplicit("Track"));
+
+        childSetAction("open_btn", onClickOpen, this);
+        childSetAction("track_btn", onClickTrack, this);
+        childSetAction("copy_btn", onClickCopy, this);
+
+        mMOAPList->setCommitOnSelectionChange(TRUE);
+        childSetCommitCallback("moap_list", onSelectMOAP, this);
+
+        gIdleCallbacks.addFunction(LLFloaterMOAPRadar::callbackIdle);
+
+        return TRUE;
+}
+
+//static
+void LLFloaterMOAPRadar::callbackIdle(void *userdata) {
+        if (LLFloaterMOAPRadar::sInstance != NULL)
+        {
+                // Do not update at every frame: this would be insane !
+                if (gFrameCount % LLFloaterMOAPRadar::sInstance->mUpdateRate == 0)
+                {
+                        LLFloaterMOAPRadar::sInstance->updateMOAPList();
+                }
+        }
+}
+
+
+void LLFloaterMOAPRadar::updateMOAPList()
+{
+        if (sInstance != this) return;
+        
+        mMOAPList->deleteAllItems();
+
+        S32 obj_count=gObjectList.getNumObjects();
+
+        int count=0;
+
+        for(int objnum=0;objnum<obj_count;objnum++)
+        {
+                LLPointer<LLViewerObject> obj = gObjectList.getObject(objnum);
+
+                if(obj.isNull())
+                        continue;
+
+                if(obj->isDead() || obj->isOrphaned())
+                        continue;
+
+                if(obj->getMediaType() == LLViewerObject::MEDIA_TYPE_NONE)
+                        continue;
+
+                LLSD element;
+                
+                element["id"] = obj->getID();
+
+                for(int face=0;face<obj->getNumTEs();face++)
+                {
+                        const LLTextureEntry * te=obj->getTE(face);
+                        if(te==NULL)
+                                continue;
+
+                        if(te->hasMedia())
+                        {
+                                LLMediaEntry* media=te->getMediaData();
+                                
+                                if(media==NULL)
+                                        continue;
+
+                                LLSD media_details;
+                                media->asLLSD(media_details);
+
+                                element["columns"][LIST_URL]["column"] = "URL";
+                                element["columns"][LIST_URL]["type"] = "text";
+                                std::string URL=media->getCurrentURL();
+                                if(URL=="")
+                                        URL="(Waiting....)";
+
+                                element["columns"][LIST_URL]["value"] = URL;
+
+                                if(mTrackingRunning && mTrackedID==obj->getID() && mTrackedFace==face)
+                                {
+                                        element["columns"][LIST_URL]["font-style"] = "BOLD";
+                                }
+                                else
+                                {
+                                        element["columns"][LIST_URL]["font-style"] = "NORMAL";
+                                }
+
+                                element["columns"][LIST_FACE]["column"] = "face";
+                                element["columns"][LIST_FACE]["type"] = "text";
+                                std::stringstream face_buf;
+                                face_buf << face;
+                                element["columns"][LIST_FACE]["value"] = face_buf.str();
+
+                                LLVector3d offset = gAgent.getPositionGlobal()-obj->getPositionGlobal();
+                                S32 dist= offset.length();
+
+                                element["columns"][LIST_DISTANCE]["column"] = "distance";
+                                element["columns"][LIST_DISTANCE]["type"] = "text";
+                                std::stringstream dist_buf;
+                                dist_buf << std::fixed << std::setprecision(2) << dist<<"m";
+                                element["columns"][LIST_DISTANCE]["value"] = dist_buf.str();
+                                
+                                if(dist<25)
+                                        element["columns"][LIST_DISTANCE]["color"] = LLColor4::green.getValue();
+                                else if(dist<50)
+                                        element["columns"][LIST_DISTANCE]["color"] = LLColor4::blue1.getValue();
+                                else if(dist<100)
+                                        element["columns"][LIST_DISTANCE]["color"] = LLColor4::black.getValue();
+                                else if(dist<256)
+                                        element["columns"][LIST_DISTANCE]["color"] = LLColor4::yellow.getValue();
+                                else
+                                        element["columns"][LIST_DISTANCE]["color"] = LLColor4::red.getValue();
+
+
+                                element["columns"][LIST_POSITION]["column"] = "position";
+                                element["columns"][LIST_POSITION]["type"] = "text";
+                                element["columns"][LIST_POSITION]["value"] = "";
+ 
+                                element["columns"][LIST_ALTITUDE]["column"] = "altitude";
+                                element["columns"][LIST_ALTITUDE]["type"] = "text";
+                                std::stringstream alt_buf;
+                                alt_buf << std::fixed << std::setprecision(2) << obj->getPositionGlobal().mdV[2]<<"m";
+                                element["columns"][LIST_ALTITUDE]["value"] = alt_buf.str();
+
+                                element["columns"][LIST_POSITION]["column"]="position";
+                                element["columns"][LIST_POSITION]["type"] = "text";
+                                std::stringstream pos_buf;
+
+                                S32 moap_x = (S32)offset.mdV[VX];
+                                S32 moap_y = (S32)offset.mdV[VY];
+                                if (moap_x >= -256 && moap_x <= 256 && moap_y >= -256 && moap_y <= 256)
+                                {
+                                        pos_buf<< std::fixed << std::setprecision(2)<<obj->getPositionRegion().mV[VX]<<","<<obj->getPositionRegion().mV[VY];
+                                }
+                                else
+                                {
+                                        if (moap_y < 0)
+                                                pos_buf<<"S";
+                                        else if (moap_y > 256)
+                                                pos_buf<<"N";
+
+                                        if (moap_x < 0)
+                                                pos_buf<<"W";
+                                        else if (moap_x > 256)
+                                                pos_buf<<"E";
+                                }
+                                
+
+                                element["columns"][LIST_POSITION]["value"] = pos_buf.str();
+
+                                mMOAPList->addElement(element, ADD_BOTTOM);
+
+                                if(mSelectedObjID==obj->getID() && mSelectedFace==face)
+                                {
+                                        mMOAPList->selectNthItem(count);
+                                }
+
+                                count++;
+                        }
+                }
+        }
+
+                updatetrackbtn();
+}
+
+// static
+void LLFloaterMOAPRadar::onClickOpen(void* userdata)
+{
+        LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+
+        LLDynamicArray<LLUUID> ids = self->mMOAPList->getSelectedIDs();
+
+        if(ids.empty())
+        {
+                return;
+        }
+
+        LLUUID id=ids.front();
+
+        LLPointer<LLViewerObject> obj = gObjectList.findObject(id);
+        if(obj.notNull())
+        {
+
+                const LLTextureEntry * te=obj->getTE(self->mSelectedFace);
+                if(te==NULL)
+                        return;
+
+                if(te->hasMedia())
+                {
+                        LLMediaEntry* media=te->getMediaData();
+                        if(media)
+                        {
+                                //gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(media->getCurrentURL()));
+                                LLWeb::loadURL(media->getCurrentURL());
+                        }
+                }                       
+        }
+
+}
+
+// static
+void LLFloaterMOAPRadar::onClickTrack(void* userdata)
+{
+        LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+        
+        LLDynamicArray<LLUUID> ids = self->mMOAPList->getSelectedIDs();
+
+        if(self->mTrackingRunning)
+        {
+                LLTracker::stopTracking(NULL);
+                self->mTrackingRunning=false;
+        }
+
+        if(ids.empty())
+        {
+                self->mTrackedID=LLUUID::null;
+                self->mTrackingRunning=false;
+                return;
+        }
+
+        LLUUID id=ids.front();
+
+        if(id==self->mTrackedID && self->mSelectedFace==self->mTrackedFace)
+        {
+                self->mTrackedID=LLUUID::null;
+                self->mTrackingRunning=false;
+                return;
+        }
+
+        self->mTrackedID=LLUUID::null;
+
+        LLPointer<LLViewerObject> obj = gObjectList.findObject(id);
+        if(obj.notNull())
+        {
+                LLTracker::trackLocation(obj->getPositionGlobal(),"MOAP Tracking","",LLTracker::LOCATION_ITEM);
+                self->mTrackingRunning=true;
+                self->mTrackedID=id;
+                self->mTrackedFace=self->mSelectedFace;
+        }
+}
+
+// static
+void LLFloaterMOAPRadar::onClickCopy(void* userdata)
+{
+        LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+
+        LLDynamicArray<LLUUID> ids = self->mMOAPList->getSelectedIDs();
+
+        if(ids.empty())
+        {
+                LLTracker::stopTracking(NULL);
+                return;
+        }
+
+        LLUUID id=ids.front();
+
+        LLPointer<LLViewerObject> obj = gObjectList.findObject(id);
+
+        if(obj.notNull())
+        {
+
+                const LLTextureEntry * te=obj->getTE(self->mSelectedFace);
+                if(te==NULL)
+                        return;
+
+                if(te->hasMedia())
+                {
+                        LLMediaEntry* media=te->getMediaData();
+                        if(media)
+                        {
+                                gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(media->getCurrentURL()));
+                        }
+                }                       
+        }
+
+}
+
+//static
+void LLFloaterMOAPRadar::onSelectMOAP(LLUICtrl*, void* userdata)
+{
+        LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+
+        LLScrollListItem *item = self->mMOAPList->getFirstSelected();
+        if (item)
+        {
+                self->mSelectedObjID = item->getUUID();
+                self->mSelectedFace = item->getColumn(LIST_FACE)->getValue().asInteger();
+        }
+
+        self->updatetrackbtn();
+}
+
+void LLFloaterMOAPRadar::updatetrackbtn()
+{
+        if( mTrackingRunning)
+        {
+                if( mTrackedID==mSelectedObjID && mTrackedFace==mSelectedFace)
+                {
+                        mTrackBtn->setLabel(LLStringExplicit("Untrack"));
+                }
+                else
+                {
+                        mTrackBtn->setLabel(LLStringExplicit("New Track"));
+                }
+        }
+        else
+        {
+                mTrackBtn->setLabel(LLStringExplicit("Track"));
+        }
+
+}
\ No newline at end of file
diff --git a/linden/indra/newview/rcmoapradar.h b/linden/indra/newview/rcmoapradar.h
new file mode 100644
index 0000000..1d01546
--- /dev/null
+++ b/linden/indra/newview/rcmoapradar.h
@@ -0,0 +1,58 @@
+
+
+class LLFloaterMOAPRadar : public LLFloater
+{
+
+private:
+        LLFloaterMOAPRadar();
+public:
+        ~LLFloaterMOAPRadar();
+
+        enum AVATARS_COLUMN_ORDER
+        {
+                LIST_URL,
+                LIST_FACE,
+                LIST_DISTANCE,
+                LIST_POSITION,
+                LIST_ALTITUDE
+        };
+
+        /*virtual*/ void onClose(bool app_quitting);
+        /*virtual*/ void onOpen();
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
+
+        static void toggle(void*);
+
+        static void showInstance();
+
+        static void callbackIdle(void *userdata);
+
+        void updateMOAPList();
+
+        static void onClickOpen(void* userdata);
+        static void onClickCopy(void* userdata);
+        static void onClickTrack(void* userdata);
+        static void onSelectMOAP(LLUICtrl*, void* userdata);
+
+
+private:
+        static LLFloaterMOAPRadar* sInstance;
+        LLScrollListCtrl*                       mMOAPList;
+        LLButton *                              mTrackBtn;
+
+        U32 mUpdateRate;
+
+        LLUUID mSelectedObjID;
+        U8 mSelectedFace;
+        bool mTrackingRunning;
+
+        LLUUID mTrackedID;
+        U8 mTrackedFace;
+
+        void updatetrackbtn(); 
+
+public:
+        static LLFloaterMOAPRadar* getInstance() { return sInstance; }
+
+};
\ No newline at end of file
diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP
new file mode 100644
index 0000000..c3f4887
--- /dev/null
+++ b/linden/indra/newview/res-sdl/imprudence_icon.BMP
diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png
new file mode 100644
index 0000000..8795fa7
--- /dev/null
+++ b/linden/indra/newview/res/imprudence_icon.png
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 21d4785..85603cf 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -156,11 +156,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "meta-impy Viewer Project"
             VALUE "FileDescription", "meta-impy"
-            VALUE "FileVersion", "1.4.0 beta 2"
+            VALUE "FileVersion", "1.4.0 exp 1"
             VALUE "InternalName", "meta-impy"
             VALUE "OriginalFilename", "meta-impy.exe"
             VALUE "ProductName", "meta-impy"
-            VALUE "ProductVersion", "1.4.0 beta 2"
+            VALUE "ProductVersion", "1.4.0 exp 1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/dark/textures/icon_top_pick.tga b/linden/indra/newview/skins/dark/textures/icon_top_pick.tga
new file mode 100644
index 0000000..0b34882
--- /dev/null
+++ b/linden/indra/newview/skins/dark/textures/icon_top_pick.tga
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index d1f202b..92ffae7 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -205,5 +205,6 @@
 <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 -->
+<ComboBoxBg value="255, 255, 255, 255"/>
  
 </settings>
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
diff --git a/linden/indra/newview/skins/default/textures/uv_test1.bmp b/linden/indra/newview/skins/default/textures/uv_test1.bmp
new file mode 100644
index 0000000..a6ad9bc
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/uv_test1.bmp
diff --git a/linden/indra/newview/skins/default/xui/da/floater_html.xml b/linden/indra/newview/skins/default/xui/da/floater_html.xml
index 28480f8..5961a0d 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Retur" name="back_btn" />
         <button label="Frem" name="forward_btn" />
         <button label="start" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7bf1bad..55a9580 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Zurück" name="back_btn" />
         <button label="Weiter" name="forward_btn" />
         <button label="Los" name="go_btn" />
-        <string name="home_page_url">
-                http://de.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://de.secondlife.com/support
-        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 975ae60..4ec46e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -30,30 +30,29 @@
         height="386"
         help_topic="about_credits_tab"
         name="credits_panel">
-
         <text_editor bottom="6" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
   word_wrap="true">
   This meta-impy viewer is based on the Imprudence viewer, and brought to you by Dave and Chris.
-  
+
   http://onefang.net/redmine/ for bug reports, feature requests, bitching, and downloads.
   http://github.com/onefang/meta-impy for the source code.
 
 
   The Imprudence Viewer was rocked hard by:
-  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
+  Armin Weatherwax, Boroondas Gupte, CodeBastard Redgrave, Elektra Hesse, Jacek Antonelli, McCabe Maxsted, and onefang rejected.
 
   http://kokuaviewer.org/
 
   Imprudence is so awesome thanks to contributions from many generous people:
 
-  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
+  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Johnnie Carling, Lord Drakeo, Kakurady Drakenar, Katharine Berry, Kentron Katana, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
 
   For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
-  
+
   Thanks also to the developer(s) of the  Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer  for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
-  
+
   For a complete list of who did what, read the release notes!
 
   Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
index e698878..2f9fc4d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
-     width="250" height="225"
+     width="250" height="255"
      name="beacons" title="Beacons"
      rect_control="FloaterBeaconsRect" control_name="BeaconsEnabled">
-        <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">
+        <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="240" name="beacons_panel">
         <check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
+        <check_box bottom_delta="-20" follows="left|top" left="0" name="moap" label="MOAP Objects" control_name="moapbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 53dd217..5f9e745 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -68,13 +68,34 @@
      label="Values are percent" left_delta="-5" mouse_opaque="true"
      tool_tip="Default settings are Percentages and every axis set at 50"
      name="PivotPercToggle" radio_style="false" width="100" />
-  
-  <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-                                         initial_value="true" label="Show selection outlines" left_delta="143"
-                                         mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                         bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+                                         h_pad="0" halign="left" height="10" left="220" mouse_opaque="false"
+                                         name="text_box8" v_pad="0" width="150">Show during build:</text>
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
+     left="198" name="ShowBorder" width="135" />
+
+
+  <check_box bottom_delta="70" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                                         initial_value="true" label="Hidden selection" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsRenderHidden_toggle" 
                                          radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Limit Select Distance" left_delta="0" mouse_opaque="true"
+                                         initial_value="true" label="Light radius" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsRenderLightRadius_toggle" 
+                                         radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                                         initial_value="true" label="Selection beam" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsShowSelectionBeam_toggle" 
+                                         radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                                         initial_value="true" label="Selection outlines" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+                                         radio_style="false" width="270"/>
+
+  <check_box bottom_delta="198" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     label="Limit Select Distance" left_delta="148" mouse_opaque="true"
      tooltip=""
      name="limit_select_dist_check" radio_style="false" width="270" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
index 7974d85..c00a86d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -7,7 +7,7 @@
      font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
      mouse_opaque="true" name="cache_label" v_pad="0" width="185">
 Cache Will Be Cleared After
-You Restart Imprudence
+You Restart meta-impy
   </text>
   <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20"
      initial_value="false" label="Clear texture cache" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index d107454..76283c3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
@@ -16,10 +16,4 @@
              select_all_on_focus_received="true" width="435" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
              label="Go" left_delta="440" name="go_btn" width="70" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 76eee6f..12fe153 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -48,10 +48,4 @@
                              left="-110" name="set_home" width="104" />
                 </layout_panel>
         </layout_stack>
-  <string name="home_page_url">
-    http://www.secondlife.com
-  </string>
-  <string name="support_page_url">
-    http://support.secondlife.com
-  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml
new file mode 100644
index 0000000..b9e3f99
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MOAP" title="MOAP Radar"
+        can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
+        rect_control="FloaterRadarRect" min_width="700" min_height="150">
+
+        <scroll_list name="moap_list"
+                    left="10" right="-10" top="-20" bottom="40" can_resize="true"
+                    column_padding="0" follows="left|top|bottom|right"
+                    draw_heading="true" multi_select="true" search_column="1"
+                    tool_tip="MOAP List">
+                <column name="URL" label="URL" width="450" tool_tip="URL of MOAP"/>
+                <column name="face" label="Face" width="48" tool_tip="URL of MOAP"/>
+                <column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar"/>
+                <column name="position" label="Pos." width="90" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
+                <column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
+        </scroll_list>
+
+
+                <button
+                           name="open_btn"
+                           label="Open"
+                           tool_tip="Open Current URL"
+                           left="10"
+                           bottom_delta="-30"
+                           width="80"
+                           height="20"
+                           font="SansSerifSmall"
+                           follows="bottom|left"
+                               />
+                <button
+                           name="track_btn"
+                           label="(Un)Track"
+                           tool_tip="Toggle tracking of this MOAPs position"
+                           left_delta="90"
+                           bottom_delta="0"
+                           width="80"
+                           height="20"
+                           font="SansSerifSmall"
+                           follows="bottom|left"
+                               />
+                <button
+                           name="copy_btn"
+                           label="Get URL"
+                           tool_tip="Copies URL to the clipboard"
+                           left_delta="90"
+                           bottom_delta="0"
+                           width="80"
+                           height="20"
+                           font="SansSerifSmall"
+                           follows="bottom|left"
+                               />
+                <!-- upper middle row -->
+        
+</floater>
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 3f476cf..2ed5120 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
@@ -69,20 +69,24 @@
 
         <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Position" left="4" mouse_opaque="true"
-             name="radio position" radio_style="true" width="114" />
+             name="radio position" radio_style="true" width="114"
+             tool_tip="Position selected prims (Ctrl-Shift-P)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-             name="radio rotate" radio_style="true" width="114" />
+             name="radio rotate" radio_style="true" width="114"
+             tool_tip="Rotate selected prims (Ctrl)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
+             mouse_opaque="true" name="radio stretch" radio_style="true" width="123"
+             tool_tip="Resize selected prims (Ctrl-Shift)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select faces to texture" left="4" mouse_opaque="true"
-             name="radio select face" radio_style="true" width="114" />
+             name="radio select face" radio_style="true" width="114"
+             tool_tip="Select faces of prims to texture (Ctrl-Alt-F)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
              name="radio align" radio_style="true" width="114"
-       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
+             tool_tip="Align (Ctrl-Alt-M) aligns all selected prims edges along an axis.  Pack (Ctrl-Alt-Shift-M) moves all selected prims edges so they're touching." />
         <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Edit linked parts" left="4" mouse_opaque="true"
@@ -1363,9 +1367,12 @@
         <string name="status_move">
                 Drag to Move, Shift-Drag to Copy
         </string>
-  <string name="status_align">
-    CTRL-A to align on an axis, CTRL-Shift-A to Pack 
-  </string>
+        <string name="status_selectface">
+                Click to select a Face for texturing
+        </string>
+        <string name="status_align">
+                Click to Align, Shift-Click to Pack 
+        </string>
         <string name="status_modifyland">
                 Click and Hold to Modify Land
         </string>
@@ -1379,7 +1386,7 @@
                 Click Inworld to Build
         </string>
         <string name="status_selectland">
-                Click and Drag to Select Land
+                Click and Drag to select Land
         </string>
         <string name="grid_screen_text">
                 Screen
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 0cbd7c6..8295d3a 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
@@ -166,17 +166,15 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
         </menu_item_call>
         <menu_item_separator name="Copy Separator" />
-<!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
-  <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
+        <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
              name="Cut" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
-  </menu_item_call>
--->
-  <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
+            <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
              name="Copy" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
-  </menu_item_call>
-  <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
+            <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
              name="Paste" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
         </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index ffdafe2..9b9a198 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -23,15 +23,15 @@
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Imprudence Blog"
-                    label="Imprudence Blog">
+    <menu_item_call name="Imprudence communication channels"
+                    label="Imprudence communication channels">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
+                userdata="WebLaunchImprudenceComms,http://wiki.kokuaviewer.org/wiki/Communication_Channels" />
     </menu_item_call>
-    <menu_item_call name="Imprudence Forums"
-                    label="Imprudence Forums">
+    <menu_item_call name="Imprudence bug reporting"
+                    label="Imprudence bug reporting">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
+                userdata="WebLaunchImprudenceBugs,http://wiki.kokuaviewer.org/wiki/Reporting_a_bug" />
     </menu_item_call>
     <menu_item_separator />
                 <menu_item_call label="About meta-impy" name="About meta-impy">
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 193592b..125962d 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
@@ -385,6 +385,10 @@
       <on_click function="ShowFloater" userdata="mini map" />
       <on_check control="ShowMiniMap" />
     </menu_item_check>
+        <menu_item_check enabled="true" label="MOAP Radar" name="MOAPRadar" shortcut="">
+                        <on_click function="View.ToggleMOAPList" userdata="moapradar" />
+                        <on_check control="ShowMOAPRadar" />
+                </menu_item_check>
     <menu_item_separator />
     <menu_item_check label="Animation Overrider" name="AO" 
                      shortcut="control|shift|O">
@@ -677,17 +681,17 @@
                   userdata="" />
         <on_check control="RenderLightRadius" />
       </menu_item_check>
-      <menu_item_check label="Show Selection Outlines"
-                       name="Show Selection Outlines">
-        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
-        <on_check control="RenderHighlightSelections" />
-      </menu_item_check>
       <menu_item_check name="Show Selection Beam"
                        label="Show Selection Beam">
         <on_click function="ToggleControl"
                   userdata="ShowSelectionBeam" />
         <on_check control="ShowSelectionBeam" />
       </menu_item_check>
+      <menu_item_check label="Show Selection Outlines"
+                       name="Show Selection Outlines">
+        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
+        <on_check control="RenderHighlightSelections" />
+      </menu_item_check>
     </menu>
     <menu_item_separator />
     <menu_item_check name="Snap to Grid" enabled="false"
@@ -844,15 +848,15 @@
       <on_click function="ShowFloater" userdata="help tutorial" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Imprudence Blog"
-                    label="Imprudence Blog">
+    <menu_item_call name="Imprudence communication channels"
+                    label="Imprudence communication channels">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
+                userdata="WebLaunchImprudenceComms,http://wiki.kokuaviewer.org/wiki/Communication_Channels" />
     </menu_item_call>
-    <menu_item_call name="Imprudence Forums"
-                    label="Imprudence Forums">
+    <menu_item_call name="Imprudence bug reporting"
+                    label="Imprudence bug reporting">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
+                userdata="WebLaunchImprudenceBugs,http://wiki.kokuaviewer.org/wiki/Reporting_a_bug" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Portal"
@@ -1323,6 +1327,12 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="sculpt" />
         </menu_item_check>
+        <menu_item_check name="ShadowFrusta" label="Shadow Frusta">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="shadow frusta" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="shadow frusta" />
+        </menu_item_check>
         <menu_item_check name="Vectorize Perf Test"
                          label="Vectorize Perf Test">
           <on_click function="ToggleControl"
@@ -1644,23 +1654,17 @@
       <menu_item_call name="Dump Inventory" label="Dump Inventory">
         <on_click function="Advanced.DumpInventory" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Dump Focus Holder"
-                      label="Dump Focus Holder"
-                      shortcut="control|alt|F">
+      <menu_item_call name="Dump Focus Holder" label="Dump Focus Holder">
         <on_click function="Advanced.DumpFocusHolder" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Print Selected Object Info"
-                      label="Print Selected Object Info"
-                      shortcut="control|shift|P">
+      <menu_item_call name="Print Selected Object Info" label="Print Selected Object Info">
         <on_click function="Advanced.PrintSelectedObjectInfo"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call name="Print Agent Info"
-                      label="Print Agent Info" shortcut="shift|P">
+      <menu_item_call name="Print Agent Info" label="Print Agent Info">
         <on_click function="Advanced.PrintAgentInfo" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Memory Stats" label="Memory Stats"
-                      shortcut="control|alt|shift|M">
+      <menu_item_call name="Memory Stats" label="Memory Stats">
         <on_click function="Advanced.PrintTextureMemoryStats"
                   userdata="" />
       </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 5f97d74..a31f609 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7245,11 +7245,11 @@ Show Look At is a debug setting that displays where an avatar's head is looking.
   
 <notification
  icon="alert.tga"
- name="WebLaunchImprudenceBlog"
+ name="WebLaunchImprudenceComms"
  type="alert">
-Go to the Official Imprudence Blog, for the Latest News and Information.
+Go to the Official Imprudence communications channels, to discuss the Imprudence Project.
   <usetemplate
-   ignoretext="When launching web browser to view the blog"
+   ignoretext="When launching web browser to view the communications channels"
    name="okcancelignore"
    notext="Cancel"
    yestext="Go to page"/>
@@ -7257,11 +7257,11 @@ Go to the Official Imprudence Blog, for the Latest News and Information.
 
 <notification
  icon="alert.tga"
- name="WebLaunchImprudenceForums"
+ name="WebLaunchImprudenceBugs"
  type="alert">
-Go to the Official Imprudence Forums to discuss the Imprudence Project.
+Go to the Official Imprudence bug and feature trackers, to report bugs and request new features.
   <usetemplate
-   ignoretext="When launching web browser to view the forums"
+   ignoretext="When launching web browser to view the bug and feature trackers"
    name="okcancelignore"
    notext="Cancel"
    yestext="Go to page"/>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index 5977fff..8f469b1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Atrás" name="back_btn"/>
         <button label="Adelante" name="forward_btn"/>
         <button label="Ir" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index 1538189..f335617 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -7,10 +7,4 @@
         <button label="Arrêter" name="stop_btn" />
         <button label="Domicile" name="home_btn" />
         <button label="Aller" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_html.xml b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
index 21b6a21..5923c52 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
@@ -5,9 +5,6 @@
         <button label="Kezdő helyszín" name="home_btn" />
         <button label="Előre" name="forward_btn" />
         <button label="Menj" name="go_btn" />
-        <text name="home_page_url">
-                http://www.google.com
-        </text>
         <text name="in-world_help_title">
                 In-World segítség
         </text>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_html.xml b/linden/indra/newview/skins/default/xui/it/floater_html.xml
index 4080f80..b2d1951 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Indietro" name="back_btn"/>
         <button label="Avanti" name="forward_btn"/>
         <button label="Vai" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 62aac82..1cb5384 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
@@ -5,10 +5,4 @@
         <button label="ホーム" name="home_btn" />
         <button label="進む" name="forward_btn" />
         <button label="移動" name="go_btn" />
-        <string name="home_page_url">
-                http://jp.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://wiki.secondlife.com/wiki/Knowledge_Base/ja
-        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/nl/floater_html.xml b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
index 1604248..0147319 100644
--- a/linden/indra/newview/skins/default/xui/nl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Terug" name="back_btn"/>
         <button label="Vooruit" name="forward_btn"/>
         <button label="Ga" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_html.xml b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
index 90d29e1..645fe80 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
@@ -5,10 +5,4 @@
         <button label="Prześlij dalej" name="forward_btn" width="85"/>
         <line_editor left_delta="100" name="url_edit" width="420" />
         <button label="Idź" name="go_btn" left_delta="425" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index 3d500dd..aaa49c8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Voltar" name="back_btn"/>
         <button label="Adiantar" name="forward_btn"/>
         <button label="Ir" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_html.xml b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
index 4a5942b..6492440 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
@@ -4,7 +4,4 @@
         <button label="Назад" name="back_btn" />
         <button label="Вперед" name="forward_btn" />
         <button label="Перейти" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_html.xml b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
index 8bde260..11a10cf 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
@@ -4,7 +4,4 @@
         <button label="Назад" name="back_btn" />
         <button label="Вперед" name="forward_btn" />
         <button label="Перейти" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index ea49e35..9ee9d2f 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3624,24 +3624,6 @@ GLOW —  发光
    name="okignore"
    yestext="OK"/>
 </notification>
-  
-<notification name="WebLaunchImprudenceBlog">
-前往 Imprudence 官方日志阅读最新的新闻和信息。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读网络日志时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
-
-<notification name="WebLaunchImprudenceForums">
-前往 Imprudence 官方论坛讨论 Imprudence 工程。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读论坛时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
 
 <notification
  icon="alert.tga"
diff --git a/linden/indra/newview/skins/gemini/colors_base.xml b/linden/indra/newview/skins/gemini/colors_base.xml
index 0b65586..31e6c57 100644
--- a/linden/indra/newview/skins/gemini/colors_base.xml
+++ b/linden/indra/newview/skins/gemini/colors_base.xml
@@ -66,7 +66,7 @@
 <ScrollBgWriteableColor value="33, 33, 33, 80" />

 <ScrollBGStripeColor value="100, 100, 100, 25" />

 <ScrollDisabledColor value="33, 33, 33, 204" />

-<ScrollSelectedBGColor value="222, 222, 222, 150" />

+<ScrollSelectedBGColor value="33, 33, 33, 204" />

 <ScrollSelectedFGColor value="255, 255, 255, 255" />                <!-- Text color -->

 <ScrollUnselectedColor value="222, 222, 222, 150" />                <!-- Text color -->

 <ScrollHighlightedColor value="222, 222, 222, 80" />        <!-- Hover color -->

diff --git a/linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 0000000..5c86082
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
diff --git a/linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 0000000..79ba740
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
diff --git a/linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 0000000..60c62e9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
diff --git a/linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 0000000..7b55a05
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
diff --git a/linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 0000000..4bed5ce
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
diff --git a/linden/indra/newview/skins/silver/textures/active_speakers.tga b/linden/indra/newview/skins/silver/textures/active_speakers.tga
new file mode 100644
index 0000000..ccd902c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/active_speakers.tga
diff --git a/linden/indra/newview/skins/silver/textures/active_voice_tab.tga b/linden/indra/newview/skins/silver/textures/active_voice_tab.tga
new file mode 100644
index 0000000..1a68c98
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/active_voice_tab.tga
diff --git a/linden/indra/newview/skins/silver/textures/arrow_down.tga b/linden/indra/newview/skins/silver/textures/arrow_down.tga
new file mode 100644
index 0000000..5b05df1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_down.tga
diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga
new file mode 100644
index 0000000..43fbf12
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_left.tga
diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga
new file mode 100644
index 0000000..a92ac9c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_right.tga
diff --git a/linden/indra/newview/skins/silver/textures/arrow_up.tga b/linden/indra/newview/skins/silver/textures/arrow_up.tga
new file mode 100644
index 0000000..2c27ed1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_up.tga
diff --git a/linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 0000000..4bc75f5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
diff --git a/linden/indra/newview/skins/silver/textures/black.tga b/linden/indra/newview/skins/silver/textures/black.tga
new file mode 100644
index 0000000..e368ea4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/black.tga
diff --git a/linden/indra/newview/skins/silver/textures/btn_chatbar.tga b/linden/indra/newview/skins/silver/textures/btn_chatbar.tga
new file mode 100644
index 0000000..52bd97a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/btn_chatbar.tga
diff --git a/linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga b/linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga
new file mode 100644
index 0000000..b8398b5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_pause.tga b/linden/indra/newview/skins/silver/textures/button_anim_pause.tga
new file mode 100644
index 0000000..ccd4a08
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_anim_pause.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga b/linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga
new file mode 100644
index 0000000..d1f9a66
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_play.tga b/linden/indra/newview/skins/silver/textures/button_anim_play.tga
new file mode 100644
index 0000000..a19dffd
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_anim_play.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga b/linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga
new file mode 100644
index 0000000..143ec5d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_stop.tga b/linden/indra/newview/skins/silver/textures/button_anim_stop.tga
new file mode 100644
index 0000000..2615d26
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_anim_stop.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga b/linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga
new file mode 100644
index 0000000..a271b3e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga b/linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga
new file mode 100644
index 0000000..9be524e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga b/linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga
new file mode 100644
index 0000000..3ca7479
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga
diff --git a/linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga b/linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 0000000..759b639
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga
diff --git a/linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 0000000..79abce1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
diff --git a/linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 0000000..061f1f2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
diff --git a/linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 0000000..50d686f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga b/linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga
new file mode 100644
index 0000000..074ded7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga b/linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga
new file mode 100644
index 0000000..79d2590
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga b/linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga
new file mode 100644
index 0000000..8e5796f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga b/linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga
new file mode 100644
index 0000000..175b07d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga
diff --git a/linden/indra/newview/skins/silver/textures/close_in_blue.tga b/linden/indra/newview/skins/silver/textures/close_in_blue.tga
new file mode 100644
index 0000000..69f3831
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/close_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/close_inactive_blue.tga b/linden/indra/newview/skins/silver/textures/close_inactive_blue.tga
new file mode 100644
index 0000000..fcd62aa
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/close_inactive_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/closebox.tga b/linden/indra/newview/skins/silver/textures/closebox.tga
new file mode 100644
index 0000000..616dc48
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/closebox.tga
diff --git a/linden/indra/newview/skins/silver/textures/combobox_arrow.tga b/linden/indra/newview/skins/silver/textures/combobox_arrow.tga
new file mode 100644
index 0000000..0f3efe9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/combobox_arrow.tga
diff --git a/linden/indra/newview/skins/silver/textures/darkgray.tga b/linden/indra/newview/skins/silver/textures/darkgray.tga
new file mode 100644
index 0000000..e69be08
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/darkgray.tga
diff --git a/linden/indra/newview/skins/silver/textures/down_arrow.png b/linden/indra/newview/skins/silver/textures/down_arrow.png
new file mode 100644
index 0000000..ea89b50
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/down_arrow.png
diff --git a/linden/indra/newview/skins/silver/textures/eye_button_active.tga b/linden/indra/newview/skins/silver/textures/eye_button_active.tga
new file mode 100644
index 0000000..5c849eb
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/eye_button_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/eye_button_inactive.tga b/linden/indra/newview/skins/silver/textures/eye_button_inactive.tga
new file mode 100644
index 0000000..82809c2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/eye_button_inactive.tga
diff --git a/linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 0000000..ac9213b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
diff --git a/linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga b/linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga
new file mode 100644
index 0000000..4d54e42
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga
diff --git a/linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga b/linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga
new file mode 100644
index 0000000..1fc2f04
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga
diff --git a/linden/indra/newview/skins/silver/textures/ff_online_status_button.tga b/linden/indra/newview/skins/silver/textures/ff_online_status_button.tga
new file mode 100644
index 0000000..5772a94
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ff_online_status_button.tga
diff --git a/linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga b/linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga
new file mode 100644
index 0000000..be1ef1e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga
diff --git a/linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga b/linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga
new file mode 100644
index 0000000..e27c2f6
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_left.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_left.tga
new file mode 100644
index 0000000..6263f6e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/flyout_btn_left.tga
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 0000000..a63c8c0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga
new file mode 100644
index 0000000..c22a71b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_right.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_right.tga
new file mode 100644
index 0000000..b86451f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/flyout_btn_right.tga
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 0000000..c4efcaa
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga
new file mode 100644
index 0000000..e6d79e2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_chatbar.tga b/linden/indra/newview/skins/silver/textures/icn_chatbar.tga
new file mode 100644
index 0000000..67662f7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_chatbar.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_label_media.tga b/linden/indra/newview/skins/silver/textures/icn_label_media.tga
new file mode 100644
index 0000000..603d607
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_label_media.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_label_music.tga b/linden/indra/newview/skins/silver/textures/icn_label_music.tga
new file mode 100644
index 0000000..9acf8f4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_label_music.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_label_web.tga b/linden/indra/newview/skins/silver/textures/icn_label_web.tga
new file mode 100644
index 0000000..577fc02
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_label_web.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_media-pause.tga b/linden/indra/newview/skins/silver/textures/icn_media-pause.tga
new file mode 100644
index 0000000..a2cfeee
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_media-pause.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_media-play.tga b/linden/indra/newview/skins/silver/textures/icn_media-play.tga
new file mode 100644
index 0000000..c810318
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_media-play.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_media_movie.tga b/linden/indra/newview/skins/silver/textures/icn_media_movie.tga
new file mode 100644
index 0000000..603d607
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_media_movie.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_media_web.tga b/linden/indra/newview/skins/silver/textures/icn_media_web.tga
new file mode 100644
index 0000000..bf962ae
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_media_web.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_music-pause.tga b/linden/indra/newview/skins/silver/textures/icn_music-pause.tga
new file mode 100644
index 0000000..cfa092c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_music-pause.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_music-play.tga b/linden/indra/newview/skins/silver/textures/icn_music-play.tga
new file mode 100644
index 0000000..1854abc
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_music-play.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_pause.tga b/linden/indra/newview/skins/silver/textures/icn_pause.tga
new file mode 100644
index 0000000..2808510
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_pause.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_play.tga b/linden/indra/newview/skins/silver/textures/icn_play.tga
new file mode 100644
index 0000000..0833398
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_play.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga b/linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga
new file mode 100644
index 0000000..20953ad
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga b/linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga
new file mode 100644
index 0000000..5ce7a9b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga b/linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga
new file mode 100644
index 0000000..e626c5a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga b/linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 0000000..86c6e59
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga b/linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 0000000..0a4bb99
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga b/linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga
new file mode 100644
index 0000000..d19ce60
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_stop.tga b/linden/indra/newview/skins/silver/textures/icn_stop.tga
new file mode 100644
index 0000000..c7f12f2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_stop.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga
new file mode 100644
index 0000000..3a56ea7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga
new file mode 100644
index 0000000..da3d694
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga
new file mode 100644
index 0000000..3197c08
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga
new file mode 100644
index 0000000..ba7bf97
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga
new file mode 100644
index 0000000..d574584
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga
new file mode 100644
index 0000000..bf1702e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 0000000..e8bfaa7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga b/linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga
new file mode 100644
index 0000000..7792bc1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga b/linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga
new file mode 100644
index 0000000..062820b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga b/linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga
new file mode 100644
index 0000000..6d49ede
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga b/linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga
new file mode 100644
index 0000000..8a377c1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga b/linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 0000000..d858245
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga
new file mode 100644
index 0000000..d7e9cd2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 0000000..99c9a71
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 0000000..26ae300
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 0000000..4b8f5a2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga
new file mode 100644
index 0000000..b712c81
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_auction.tga b/linden/indra/newview/skins/silver/textures/icon_auction.tga
new file mode 100644
index 0000000..76d1227
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_auction.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga b/linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga
new file mode 100644
index 0000000..ea6a076
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_avatar_online.tga b/linden/indra/newview/skins/silver/textures/icon_avatar_online.tga
new file mode 100644
index 0000000..13f8da8
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_avatar_online.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_day_cycle.tga b/linden/indra/newview/skins/silver/textures/icon_day_cycle.tga
new file mode 100644
index 0000000..98927fc
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_day_cycle.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_event.tga b/linden/indra/newview/skins/silver/textures/icon_event.tga
new file mode 100644
index 0000000..2c06d08
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_event.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_event_mature.tga b/linden/indra/newview/skins/silver/textures/icon_event_mature.tga
new file mode 100644
index 0000000..71067c0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_event_mature.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_for_sale.tga b/linden/indra/newview/skins/silver/textures/icon_for_sale.tga
new file mode 100644
index 0000000..cb7f313
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_for_sale.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_group.tga b/linden/indra/newview/skins/silver/textures/icon_group.tga
new file mode 100644
index 0000000..faecb81
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_group.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_groupnotice.tga b/linden/indra/newview/skins/silver/textures/icon_groupnotice.tga
new file mode 100644
index 0000000..115e4e2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_groupnotice.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga b/linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 0000000..f713020
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_lock.tga b/linden/indra/newview/skins/silver/textures/icon_lock.tga
new file mode 100644
index 0000000..98d8a2d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_lock.tga
diff --git a/linden/indra/newview/skins/silver/textures/icon_top_pick.tga b/linden/indra/newview/skins/silver/textures/icon_top_pick.tga
new file mode 100644
index 0000000..0b34882
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/icon_top_pick.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_animation.tga b/linden/indra/newview/skins/silver/textures/inv_folder_animation.tga
new file mode 100644
index 0000000..7466825
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_animation.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga b/linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga
new file mode 100644
index 0000000..3262605
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga b/linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga
new file mode 100644
index 0000000..d7e0ab7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga b/linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga
new file mode 100644
index 0000000..bce4a65
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga b/linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga
new file mode 100644
index 0000000..9392256
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga b/linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga
new file mode 100644
index 0000000..0f57ccf
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga b/linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga
new file mode 100644
index 0000000..1285c25
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga b/linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga
new file mode 100644
index 0000000..daebd14
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_object.tga b/linden/indra/newview/skins/silver/textures/inv_folder_object.tga
new file mode 100644
index 0000000..f3e9ea0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_object.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga b/linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga
new file mode 100644
index 0000000..84d116a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga b/linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga
new file mode 100644
index 0000000..d536448
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_script.tga b/linden/indra/newview/skins/silver/textures/inv_folder_script.tga
new file mode 100644
index 0000000..b8a04e4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_script.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga b/linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga
new file mode 100644
index 0000000..468ec2c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_sound.tga b/linden/indra/newview/skins/silver/textures/inv_folder_sound.tga
new file mode 100644
index 0000000..c58300b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_sound.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_texture.tga b/linden/indra/newview/skins/silver/textures/inv_folder_texture.tga
new file mode 100644
index 0000000..6a321cf
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_texture.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_trash.tga b/linden/indra/newview/skins/silver/textures/inv_folder_trash.tga
new file mode 100644
index 0000000..7aa6b93
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_folder_trash.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_animation.tga b/linden/indra/newview/skins/silver/textures/inv_item_animation.tga
new file mode 100644
index 0000000..637033a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_animation.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_attach.tga b/linden/indra/newview/skins/silver/textures/inv_item_attach.tga
new file mode 100644
index 0000000..55469f6
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_attach.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 0000000..ad8658c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga
new file mode 100644
index 0000000..9660601
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_clothing.tga b/linden/indra/newview/skins/silver/textures/inv_item_clothing.tga
new file mode 100644
index 0000000..b786426
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_clothing.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_eyes.tga b/linden/indra/newview/skins/silver/textures/inv_item_eyes.tga
new file mode 100644
index 0000000..18e8368
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_eyes.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_gesture.tga b/linden/indra/newview/skins/silver/textures/inv_item_gesture.tga
new file mode 100644
index 0000000..a6fe629
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_gesture.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_gloves.tga b/linden/indra/newview/skins/silver/textures/inv_item_gloves.tga
new file mode 100644
index 0000000..bcc6aee
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_gloves.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_hair.tga b/linden/indra/newview/skins/silver/textures/inv_item_hair.tga
new file mode 100644
index 0000000..686214e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_hair.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_jacket.tga b/linden/indra/newview/skins/silver/textures/inv_item_jacket.tga
new file mode 100644
index 0000000..69c5f07
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_jacket.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_landmark.tga b/linden/indra/newview/skins/silver/textures/inv_item_landmark.tga
new file mode 100644
index 0000000..833d4e6
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_landmark.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga b/linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga
new file mode 100644
index 0000000..283f0ec
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_notecard.tga b/linden/indra/newview/skins/silver/textures/inv_item_notecard.tga
new file mode 100644
index 0000000..0ad68d0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_notecard.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_object.tga b/linden/indra/newview/skins/silver/textures/inv_item_object.tga
new file mode 100644
index 0000000..c749105
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_object.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga b/linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga
new file mode 100644
index 0000000..4b3a590
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_pants.tga b/linden/indra/newview/skins/silver/textures/inv_item_pants.tga
new file mode 100644
index 0000000..38dbc57
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_pants.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_script.tga b/linden/indra/newview/skins/silver/textures/inv_item_script.tga
new file mode 100644
index 0000000..1203e8a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_script.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_shape.tga b/linden/indra/newview/skins/silver/textures/inv_item_shape.tga
new file mode 100644
index 0000000..2e8a5a7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_shape.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_shirt.tga b/linden/indra/newview/skins/silver/textures/inv_item_shirt.tga
new file mode 100644
index 0000000..8c6f5eb
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_shirt.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_shoes.tga b/linden/indra/newview/skins/silver/textures/inv_item_shoes.tga
new file mode 100644
index 0000000..ac7a2b0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_shoes.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_skin.tga b/linden/indra/newview/skins/silver/textures/inv_item_skin.tga
new file mode 100644
index 0000000..ab4169f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_skin.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_skirt.tga b/linden/indra/newview/skins/silver/textures/inv_item_skirt.tga
new file mode 100644
index 0000000..4476040
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_skirt.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga b/linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga
new file mode 100644
index 0000000..3adf4e5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_socks.tga b/linden/indra/newview/skins/silver/textures/inv_item_socks.tga
new file mode 100644
index 0000000..2d7bb7e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_socks.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_sound.tga b/linden/indra/newview/skins/silver/textures/inv_item_sound.tga
new file mode 100644
index 0000000..7ef9052
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_sound.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_texture.tga b/linden/indra/newview/skins/silver/textures/inv_item_texture.tga
new file mode 100644
index 0000000..6b4269d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_texture.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_underpants.tga b/linden/indra/newview/skins/silver/textures/inv_item_underpants.tga
new file mode 100644
index 0000000..f679e34
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_underpants.tga
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga b/linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga
new file mode 100644
index 0000000..359e3d7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga
diff --git a/linden/indra/newview/skins/silver/textures/lightgray.tga b/linden/indra/newview/skins/silver/textures/lightgray.tga
new file mode 100644
index 0000000..e69be08
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/lightgray.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_avatar_16.tga b/linden/indra/newview/skins/silver/textures/map_avatar_16.tga
new file mode 100644
index 0000000..f59e9e9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_avatar_16.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga b/linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga
new file mode 100644
index 0000000..8500ead
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_event.tga b/linden/indra/newview/skins/silver/textures/map_event.tga
new file mode 100644
index 0000000..2c06d08
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_event.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_event_adult.tga b/linden/indra/newview/skins/silver/textures/map_event_adult.tga
new file mode 100644
index 0000000..f548126
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_event_adult.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_event_mature.tga b/linden/indra/newview/skins/silver/textures/map_event_mature.tga
new file mode 100644
index 0000000..71067c0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_event_mature.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_home.tga b/linden/indra/newview/skins/silver/textures/map_home.tga
new file mode 100644
index 0000000..acaaa3d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_home.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_infohub.tga b/linden/indra/newview/skins/silver/textures/map_infohub.tga
new file mode 100644
index 0000000..545b8e5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_infohub.tga
diff --git a/linden/indra/newview/skins/silver/textures/map_telehub.tga b/linden/indra/newview/skins/silver/textures/map_telehub.tga
new file mode 100644
index 0000000..57aa723
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/map_telehub.tga
diff --git a/linden/indra/newview/skins/silver/textures/minimize.tga b/linden/indra/newview/skins/silver/textures/minimize.tga
new file mode 100644
index 0000000..c1ab0f9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/minimize.tga
diff --git a/linden/indra/newview/skins/silver/textures/minimize_inactive.tga b/linden/indra/newview/skins/silver/textures/minimize_inactive.tga
new file mode 100644
index 0000000..191c5d3
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/minimize_inactive.tga
diff --git a/linden/indra/newview/skins/silver/textures/minimize_pressed.tga b/linden/indra/newview/skins/silver/textures/minimize_pressed.tga
new file mode 100644
index 0000000..07368e5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/minimize_pressed.tga
diff --git a/linden/indra/newview/skins/silver/textures/notify_next.png b/linden/indra/newview/skins/silver/textures/notify_next.png
new file mode 100644
index 0000000..b160ef7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/notify_next.png
diff --git a/linden/indra/newview/skins/silver/textures/object_cone.tga b/linden/indra/newview/skins/silver/textures/object_cone.tga
new file mode 100644
index 0000000..1bbca75
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_cone.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_cone_active.tga b/linden/indra/newview/skins/silver/textures/object_cone_active.tga
new file mode 100644
index 0000000..7b8799d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_cone_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_cube.tga b/linden/indra/newview/skins/silver/textures/object_cube.tga
new file mode 100644
index 0000000..c08f874
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_cube.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_cube_active.tga b/linden/indra/newview/skins/silver/textures/object_cube_active.tga
new file mode 100644
index 0000000..fac474e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_cube_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_cylinder.tga b/linden/indra/newview/skins/silver/textures/object_cylinder.tga
new file mode 100644
index 0000000..271c841
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_cylinder.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_cylinder_active.tga b/linden/indra/newview/skins/silver/textures/object_cylinder_active.tga
new file mode 100644
index 0000000..5dc5c5e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_cylinder_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_grass.tga b/linden/indra/newview/skins/silver/textures/object_grass.tga
new file mode 100644
index 0000000..3e6b8f8
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_grass.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_grass_active.tga b/linden/indra/newview/skins/silver/textures/object_grass_active.tga
new file mode 100644
index 0000000..98f84e5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_grass_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cone.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cone.tga
new file mode 100644
index 0000000..7b7cc63
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_hemi_cone.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga
new file mode 100644
index 0000000..eabec15
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga
new file mode 100644
index 0000000..dc15140
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 0000000..8047d7f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga b/linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga
new file mode 100644
index 0000000..9f21f3a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga b/linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga
new file mode 100644
index 0000000..c6d20e0
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_prism.tga b/linden/indra/newview/skins/silver/textures/object_prism.tga
new file mode 100644
index 0000000..489fa35
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_prism.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_prism_active.tga b/linden/indra/newview/skins/silver/textures/object_prism_active.tga
new file mode 100644
index 0000000..b53b897
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_prism_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_pyramid.tga b/linden/indra/newview/skins/silver/textures/object_pyramid.tga
new file mode 100644
index 0000000..69a1d09
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_pyramid.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_pyramid_active.tga b/linden/indra/newview/skins/silver/textures/object_pyramid_active.tga
new file mode 100644
index 0000000..98aaade
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_pyramid_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_ring.tga b/linden/indra/newview/skins/silver/textures/object_ring.tga
new file mode 100644
index 0000000..4dd05e4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_ring.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_ring_active.tga b/linden/indra/newview/skins/silver/textures/object_ring_active.tga
new file mode 100644
index 0000000..4e98b59
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_ring_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_sphere.tga b/linden/indra/newview/skins/silver/textures/object_sphere.tga
new file mode 100644
index 0000000..e6a41d5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_sphere.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_sphere_active.tga b/linden/indra/newview/skins/silver/textures/object_sphere_active.tga
new file mode 100644
index 0000000..33c944a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_sphere_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_tetrahedron.tga b/linden/indra/newview/skins/silver/textures/object_tetrahedron.tga
new file mode 100644
index 0000000..01e02cd
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_tetrahedron.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga b/linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga
new file mode 100644
index 0000000..3e30a7c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_torus.tga b/linden/indra/newview/skins/silver/textures/object_torus.tga
new file mode 100644
index 0000000..8c9f665
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_torus.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_torus_active.tga b/linden/indra/newview/skins/silver/textures/object_torus_active.tga
new file mode 100644
index 0000000..53d2da8
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_torus_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_tree.tga b/linden/indra/newview/skins/silver/textures/object_tree.tga
new file mode 100644
index 0000000..dc427e9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_tree.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_tree_active.tga b/linden/indra/newview/skins/silver/textures/object_tree_active.tga
new file mode 100644
index 0000000..36509fd
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_tree_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_tube.tga b/linden/indra/newview/skins/silver/textures/object_tube.tga
new file mode 100644
index 0000000..b53d1e9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_tube.tga
diff --git a/linden/indra/newview/skins/silver/textures/object_tube_active.tga b/linden/indra/newview/skins/silver/textures/object_tube_active.tga
new file mode 100644
index 0000000..c990b0b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/object_tube_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/progressbar_fill.tga b/linden/indra/newview/skins/silver/textures/progressbar_fill.tga
new file mode 100644
index 0000000..f078013
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/progressbar_fill.tga
diff --git a/linden/indra/newview/skins/silver/textures/progressbar_track.tga b/linden/indra/newview/skins/silver/textures/progressbar_track.tga
new file mode 100644
index 0000000..2057071
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/progressbar_track.tga
diff --git a/linden/indra/newview/skins/silver/textures/ptt_lock_off.tga b/linden/indra/newview/skins/silver/textures/ptt_lock_off.tga
new file mode 100644
index 0000000..d15ce1f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ptt_lock_off.tga
diff --git a/linden/indra/newview/skins/silver/textures/ptt_lock_on.tga b/linden/indra/newview/skins/silver/textures/ptt_lock_on.tga
new file mode 100644
index 0000000..1e21fce
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/ptt_lock_on.tga
diff --git a/linden/indra/newview/skins/silver/textures/radio_active_false.tga b/linden/indra/newview/skins/silver/textures/radio_active_false.tga
new file mode 100644
index 0000000..02043ae
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/radio_active_false.tga
diff --git a/linden/indra/newview/skins/silver/textures/radio_active_true.tga b/linden/indra/newview/skins/silver/textures/radio_active_true.tga
new file mode 100644
index 0000000..bf1035a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/radio_active_true.tga
diff --git a/linden/indra/newview/skins/silver/textures/radio_inactive_false.tga b/linden/indra/newview/skins/silver/textures/radio_inactive_false.tga
new file mode 100644
index 0000000..48a9342
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/radio_inactive_false.tga
diff --git a/linden/indra/newview/skins/silver/textures/radio_inactive_true.tga b/linden/indra/newview/skins/silver/textures/radio_inactive_true.tga
new file mode 100644
index 0000000..785b3fa
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/radio_inactive_true.tga
diff --git a/linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga b/linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 0000000..6c3a6ad
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/restore.tga b/linden/indra/newview/skins/silver/textures/restore.tga
new file mode 100644
index 0000000..8263ae1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/restore.tga
diff --git a/linden/indra/newview/skins/silver/textures/restore_inactive.tga b/linden/indra/newview/skins/silver/textures/restore_inactive.tga
new file mode 100644
index 0000000..191c5d3
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/restore_inactive.tga
diff --git a/linden/indra/newview/skins/silver/textures/restore_pressed.tga b/linden/indra/newview/skins/silver/textures/restore_pressed.tga
new file mode 100644
index 0000000..aa44394
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/restore_pressed.tga
diff --git a/linden/indra/newview/skins/silver/textures/rounded_square.tga b/linden/indra/newview/skins/silver/textures/rounded_square.tga
new file mode 100644
index 0000000..c8fc7b7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/rounded_square.tga
diff --git a/linden/indra/newview/skins/silver/textures/rounded_square_soft.tga b/linden/indra/newview/skins/silver/textures/rounded_square_soft.tga
new file mode 100644
index 0000000..0e5bc79
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/rounded_square_soft.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 0000000..fd870b5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 0000000..1f95b34
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 0000000..595fd59
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 0000000..86c0987
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 0000000..790e515
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 0000000..4f37667
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 0000000..4955af7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 0000000..e66696b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga b/linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 0000000..30bbbb4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga
diff --git a/linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga b/linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga
new file mode 100644
index 0000000..ce8576a
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga b/linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga
new file mode 100644
index 0000000..ff53284
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga b/linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga
new file mode 100644
index 0000000..de36da6
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga b/linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga
new file mode 100644
index 0000000..743d2c5
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/square_btn_32x128.tga b/linden/indra/newview/skins/silver/textures/square_btn_32x128.tga
new file mode 100644
index 0000000..e14e45b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/square_btn_32x128.tga
diff --git a/linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga b/linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga
new file mode 100644
index 0000000..749c0f4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga
diff --git a/linden/indra/newview/skins/silver/textures/startup_logo.j2c b/linden/indra/newview/skins/silver/textures/startup_logo.j2c
new file mode 100644
index 0000000..e3332cb
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/startup_logo.j2c
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_currency.tga b/linden/indra/newview/skins/silver/textures/status_buy_currency.tga
new file mode 100644
index 0000000..9898005
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_buy_currency.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga b/linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga
new file mode 100644
index 0000000..9d5d164
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_land.tga b/linden/indra/newview/skins/silver/textures/status_buy_land.tga
new file mode 100644
index 0000000..dded697
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_buy_land.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga b/linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga
new file mode 100644
index 0000000..f5c5fba
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_health.tga b/linden/indra/newview/skins/silver/textures/status_health.tga
new file mode 100644
index 0000000..c29a965
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_health.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_no_build.tga b/linden/indra/newview/skins/silver/textures/status_no_build.tga
new file mode 100644
index 0000000..fbd463f
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_no_build.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_no_fly.tga b/linden/indra/newview/skins/silver/textures/status_no_fly.tga
new file mode 100644
index 0000000..d93c531
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_no_fly.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_no_push.tga b/linden/indra/newview/skins/silver/textures/status_no_push.tga
new file mode 100644
index 0000000..578f0d9
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_no_push.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_no_scripts.tga b/linden/indra/newview/skins/silver/textures/status_no_scripts.tga
new file mode 100644
index 0000000..a020f4c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_no_scripts.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_no_voice.tga b/linden/indra/newview/skins/silver/textures/status_no_voice.tga
new file mode 100644
index 0000000..9e34801
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_no_voice.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_search.tga b/linden/indra/newview/skins/silver/textures/status_search.tga
new file mode 100644
index 0000000..12de046
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_search.tga
diff --git a/linden/indra/newview/skins/silver/textures/status_voice.tga b/linden/indra/newview/skins/silver/textures/status_voice.tga
new file mode 100644
index 0000000..9e34801
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/status_voice.tga
diff --git a/linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga b/linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga
new file mode 100644
index 0000000..1c68257
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga b/linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 0000000..60887a8
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/tab_left.tga b/linden/indra/newview/skins/silver/textures/tab_left.tga
new file mode 100644
index 0000000..b2cd44b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tab_left.tga
diff --git a/linden/indra/newview/skins/silver/textures/tab_left_selected.tga b/linden/indra/newview/skins/silver/textures/tab_left_selected.tga
new file mode 100644
index 0000000..3c959a2
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tab_left_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/tab_top_blue.tga b/linden/indra/newview/skins/silver/textures/tab_top_blue.tga
new file mode 100644
index 0000000..f522c86
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tab_top_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga b/linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga
new file mode 100644
index 0000000..66d3541
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga
diff --git a/linden/indra/newview/skins/silver/textures/tearoff_pressed.tga b/linden/indra/newview/skins/silver/textures/tearoff_pressed.tga
new file mode 100644
index 0000000..cea2fdc
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tearoff_pressed.tga
diff --git a/linden/indra/newview/skins/silver/textures/tearoffbox.tga b/linden/indra/newview/skins/silver/textures/tearoffbox.tga
new file mode 100644
index 0000000..6a11c07
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tearoffbox.tga
diff --git a/linden/indra/newview/skins/silver/textures/tool_dozer.tga b/linden/indra/newview/skins/silver/textures/tool_dozer.tga
new file mode 100644
index 0000000..0bb1a2e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tool_dozer.tga
diff --git a/linden/indra/newview/skins/silver/textures/tool_dozer_active.tga b/linden/indra/newview/skins/silver/textures/tool_dozer_active.tga
new file mode 100644
index 0000000..faf232d
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tool_dozer_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/tool_zoom.tga b/linden/indra/newview/skins/silver/textures/tool_zoom.tga
new file mode 100644
index 0000000..0a467b7
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tool_zoom.tga
diff --git a/linden/indra/newview/skins/silver/textures/tool_zoom_active.tga b/linden/indra/newview/skins/silver/textures/tool_zoom_active.tga
new file mode 100644
index 0000000..cee7e50
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/tool_zoom_active.tga
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_bg.tga b/linden/indra/newview/skins/silver/textures/toolbar_bg.tga
new file mode 100644
index 0000000..d4525d1
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/toolbar_bg.tga
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga b/linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga
new file mode 100644
index 0000000..9be524e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga b/linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga
new file mode 100644
index 0000000..6cd80b4
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga b/linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga
new file mode 100644
index 0000000..d1d63f3
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_tab.tga b/linden/indra/newview/skins/silver/textures/toolbar_tab.tga
new file mode 100644
index 0000000..e241f2e
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/toolbar_tab.tga
diff --git a/linden/indra/newview/skins/silver/textures/up_arrow.png b/linden/indra/newview/skins/silver/textures/up_arrow.png
new file mode 100644
index 0000000..31f1c38
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/up_arrow.png
diff --git a/linden/indra/newview/skins/silver/textures/white.tga b/linden/indra/newview/skins/silver/textures/white.tga
new file mode 100644
index 0000000..55e3793
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/white.tga
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index e350af0..b67af99 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -232,21 +232,15 @@ class WindowsManifest(ViewerManifest):
 
     def construct(self):
         super(WindowsManifest, self).construct()
-        # the final exe is complicated because we're not sure where it's coming from,
-        # nor do we have a fixed name for the executable
-        # Actually, we know on both counts -- MC
-        if self.configuration().lower() == "release":
-            self.path(self.find_existing_file('release/meta-impy-bin.exe'), dst=self.final_exe())
-        elif self.configuration().lower() == "releasesse2":
-            self.path(self.find_existing_file('releasesse2/meta-impy-bin.exe'), dst=self.final_exe())
-        elif self.configuration().lower() == "relwithdebinfo":
-            self.path(self.find_existing_file('relwithdebinfo/meta-impy-bin.exe'), dst=self.final_exe())
-        elif self.configuration().lower() == "debug":
-            self.path(self.find_existing_file('debug/meta-impy-bin.exe'), dst=self.final_exe())
-        else:
-            self.path(self.find_existing_file('release/meta-impy-bin.exe', 'releasesse2/meta-impy-bin.exe', 'relwithdebinfo/meta-impy-bin.exe', 'debug/meta-impy-bin.exe'), dst=self.final_exe())
+        # Come out, come out, where ever you are.
+        executable = self.find_existing_file('release/meta-impy-bin.exe', 'releasesse2/meta-impy-bin.exe', 'relwithdebinfo/meta-impy-bin.exe', 'debug/meta-impy-bin.exe', './meta-impy-bin.exe')
+        nmake = False
+        self.path(executable, dst=self.final_exe())
 
         # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied
+        # Don't think this ever worked, the destination seems bogus.
+        # It's trying to copy a built file outside of the source tree, a file we have anyway.
+        # TODO - do we even need this?
         symbol_ver = '.'.join(self.args['version'])
         symbol_file = 'meta-impy-%s.%s.pdb' % (symbol_ver, self.args['configuration'])
         symbol_path = '../../../../../pdb_files/%s' % (symbol_file)
@@ -255,26 +249,28 @@ class WindowsManifest(ViewerManifest):
         else:
             #print "%s doesn't exist yet" % (os.getcwd() + symbol_path)
             try:
-                self.path(self.find_existing_file('release/meta-impy-bin.pdb'), dst="../%s" % (symbol_path))
+                self.path(self.find_existing_file(executable.split('/', 1)[0] % '/meta-impy-bin.pdb'), dst="../%s" % (symbol_path))
                 pass
             except:
                 print "Can't save symbol file %s, skipping" % (symbol_path)
                 pass
-        
+
         self.gather_documents()
 
         if self.prefix("../..", dst="doc"):
             self.path("LICENSE-libraries.txt")
             self.end_prefix("../..")
 
-
         self.path("meta-impy.url")
 
         # Plugin host application
-        self.path(os.path.join(os.pardir,
-                               'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"),
-                  "SLPlugin.exe")
-
+        try:
+            self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe")
+        except:
+            # Probably an nmake build, which is not putting exe's into the configuration folders.
+            self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', "SLPlugin.exe"), "SLPlugin.exe")
+            # Propogate our wild guess.
+            nmake = True
 
         self.path("featuretable.txt")
 
@@ -283,17 +279,17 @@ class WindowsManifest(ViewerManifest):
 
         # For using FMOD for sound... DJS
         #self.path("fmod.dll")
-        
+
         # For spellchecking
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if self.prefix(self.args['configuration'], dst=""):
             self.path("libhunspell.dll")
             self.end_prefix()
 
-        # Copy the llkdu DSO .config
+        # Copy the llkdu DSO .config
         self.path("llkdu.dll.2.config")
 
         # Get llcommon and deps.
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if self.prefix(self.args['configuration'], dst=""):
             self.path('libapr-1.dll')
             self.path('libaprutil-1.dll')
             self.path('libapriconv-1.dll')
@@ -309,23 +305,28 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
             self.path("openal32.dll")
             self.path("alut.dll")
-            self.end_prefix()           
+            self.end_prefix()
 
+        # TODO - Yes, I know, would be better if nmake builds put stuff in the right place, track that down and fix it later.
+        if nmake:
+            config = ''
+        else:
+            config = self.args['configuration']
         # Media plugins - QuickTime
-        if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
+        if self.prefix(src='../media_plugins/quicktime/%s' % config, dst="llplugin"):
             self.path("media_plugin_quicktime.dll")
             self.end_prefix()
 
         # Media plugins - WebKit/Qt
-        if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
+        if self.prefix(src='../media_plugins/webkit/%s' % config, dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
 
         # Media plugins - GStreamer
-        if self.prefix(src='../media_plugins/gstreamer010/%s' % self.args['configuration'], dst="llplugin"):
+        if self.prefix(src='../media_plugins/gstreamer010/%s' % config, dst="llplugin"):
             self.path("media_plugin_gstreamer010.dll")
-            self.end_prefix()            
- 
+            self.end_prefix()
+
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
             self.path("libeay32.dll")
@@ -476,13 +477,15 @@ class WindowsManifest(ViewerManifest):
             sse_string = "-(SSE2-optimized)"
 
         version = '.'.join(self.args['version'])
-        base_filename = self.installer_prefix() + version + sse_string
+        version_number = version.split('-', 1)[0]
+        base_filename = self.installer_prefix() + version + "-Windows-x86" + sse_string
         app_name = self.channel()
         app_ver_name="%s %s" % (app_name, version)
 
         new_script = base_filename + ".iss"
         self.replace_in("installers/windows/meta-impy_installer_template.iss", new_script, {
                 "%%VERSION%%":version,
+                "%%VERSIONNUMBER%%":version_number,
                 "%%INSTALLERFILENAME%%":base_filename,
                 "%%PACKAGEFILES%%":self.args['dest'],
                 "%%APPNAME%%":app_name,
@@ -1035,13 +1038,32 @@ class Linux_i686Manifest(LinuxManifest):
                 #self.path("libgstvolume.so")
                 #self.path("libgstvorbis.so")
                 #self.path("libgstwavparse.so")
-                
+
                 #self.end_prefix("gstreamer-plugins")
             
 # [$PLOTR$] these two are not needed when STATIC_LIBOTR_ETC is on in .../linden/indra/CMakeLists.txt
 #            self.path("libotr.so.2.2.0")
 #            self.path("libotr.so.2")
 # [/$PLOTR$]
+
+            # Wish I could kill it with fire.  lol
+            self.path("libboost_date_time-mt.so")
+            self.path("libboost_date_time-mt.so.1.52.0")
+            self.path("libboost_filesystem-mt.so")
+            self.path("libboost_filesystem-mt.so.1.52.0")
+            self.path("libboost_iostreams-mt.so")
+            self.path("libboost_iostreams-mt.so.1.52.0")
+            self.path("libboost_program_options-mt.so")
+            self.path("libboost_program_options-mt.so.1.52.0")
+            self.path("libboost_regex-mt.so")
+            self.path("libboost_regex-mt.so.1.52.0")
+            self.path("libboost_signals-mt.so")
+            self.path("libboost_signals-mt.so.1.52.0")
+            self.path("libboost_system-mt.so")
+            self.path("libboost_system-mt.so.1.52.0")
+            self.path("libboost_thread-mt.so")
+            self.path("libboost_thread-mt.so.1.52.0")
+
             self.end_prefix("lib")
 
             # Vivox runtimes and libs
@@ -1124,11 +1146,48 @@ class Linux_x86_64Manifest(LinuxManifest):
 #            self.path("libpangoxft-1.0.so.0")          # So we depend system gdk pixbufs and pango anyway.
             ##self.path("libpixman-1.so.0")
                 
-                #self.end_prefix("gstreamer-plugins")
 # [$PLOTR$] these two are not needed when STATIC_LIBOTR_ETC is on in .../linden/indra/CMakeLists.txt
 #            self.path("libotr.so.2.2.0")
 #            self.path("libotr.so.2")
 # [/$PLOTR$]
+
+#KILL IT WITH FIRE
+            ## Gstreamer libs
+            #self.end_prefix("gstreamer-plugins")
+            #self.path("libgstbase-0.10.so.0")
+            #self.path("libgstreamer-0.10.so.0")
+            #self.path("libgstaudio-0.10.so.0")
+            #self.path("libgstbase-0.10.so.0")
+            #self.path("libgstcontroller-0.10.so.0")
+            #self.path("libgstdataprotocol-0.10.so.0")
+            #self.path("libgstinterfaces-0.10.so.0")
+            #self.path("libgstnetbuffer-0.10.so.0")
+            #self.path("libgstpbutils-0.10.so.0")
+            #self.path("libgstriff-0.10.so.0")
+            #self.path("libgstrtp-0.10.so.0")
+            #self.path("libgstrtsp-0.10.so.0")
+            #self.path("libgstsdp-0.10.so.0")
+            #self.path("libgsttag-0.10.so.0")
+            #self.path("libgstvideo-0.10.so.0")
+
+            # Wish I could kill it with fire.  lol
+            self.path("libboost_date_time-mt.so")
+            self.path("libboost_date_time-mt.so.1.52.0")
+            self.path("libboost_filesystem-mt.so")
+            self.path("libboost_filesystem-mt.so.1.52.0")
+            self.path("libboost_iostreams-mt.so")
+            self.path("libboost_iostreams-mt.so.1.52.0")
+            self.path("libboost_program_options-mt.so")
+            self.path("libboost_program_options-mt.so.1.52.0")
+            self.path("libboost_regex-mt.so")
+            self.path("libboost_regex-mt.so.1.52.0")
+            self.path("libboost_signals-mt.so")
+            self.path("libboost_signals-mt.so.1.52.0")
+            self.path("libboost_system-mt.so")
+            self.path("libboost_system-mt.so.1.52.0")
+            self.path("libboost_thread-mt.so")
+            self.path("libboost_thread-mt.so.1.52.0")
+
             self.end_prefix("lib64")
 
 
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index 1762096..07ec740 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -30,13 +30,15 @@ namespace ViewerInfo
 
         // These are intentionally defined here instead of in the header,
         // because they should NOT be read directly. Use the functions.
+
+        // NOTE: Some parts of the build system scan this file looking for version numbers and such, commenting out sections confuses that.
         const std::string NAME  = "meta-impy";
         const std::string VARNT = "";
         const S32         MAJOR = 1;
         const S32         MINOR = 4;
         const S32         PATCH = 0;
         const S32         RLEAS = 3; // increment for each beta/RC/release
-        const std::string EXTRA = "beta 2";
+        const std::string EXTRA = "exp 1";
 
         // Mac OS X bundle identifier. Should match the one in Info.plist.
         const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";
diff --git a/linden/indra/newview/windlightsettingsupdate.cpp b/linden/indra/newview/windlightsettingsupdate.cpp
deleted file mode 100644
index ad6e7c9..0000000
--- a/linden/indra/newview/windlightsettingsupdate.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * @file kowopenregionsettings.cpp
- * @brief Handler for OpenRegionInfo event queue message.
- *
- * Copyright (c) 2010, Patrick Sapinski
- *
- * The source code in this file ("Source Code") is provided to you
- * under the terms of the GNU General Public License, version 2.0
- * ("GPL"). 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 SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llhttpnode.h"
-#include "hippolimits.h"
-#include "llfloatertools.h"
-#include "llviewercontrol.h"
-#include "llagent.h"
-#include "llsurface.h"
-#include "llviewerregion.h"
-#include "llviewerobject.h"
-
-#include "linden_common.h"
-#include "llwaterparammanager.h"
-#include "llwaterparamset.h"
-#include "llwlparammanager.h"
-#include "llwlparamset.h"
-#include "message.h"
-#include "meta7windlight.h"
-#include "lightshare.h"
-#include "wlsettingsmanager.h"
-
-//DEBUG includes
-//#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
-
-class WindLightSettingsUpdate : public LLHTTPNode
-{
-        /*virtual*/ void post(
-                LLHTTPNode::ResponsePtr response,
-                const LLSD& context,
-                const LLSD& input) const
-        {
-                if (!input.isMap() || !input.has("body"))
-                {
-                        llinfos << "malformed WindLightSettingsUpdate update!" << llendl;        
-                        return;
-                }
-                LLWaterParamSet* mWater;
-                LLWLParamSet* mSky;
-                LLUUID* mWaterNormal;
-
-                mWater = new LLWaterParamSet();
-                mSky = new LLWLParamSet();
-                mWaterNormal = new LLUUID();
-
-                LLSD body = input["body"];
-                
-                mWater->set("waterFogColor",
-                        body["waterColorX"].asReal()   / 256.f,
-                        body["waterColorY"].asReal()   / 256.f,
-                        body["waterColorZ"].asReal()   / 256.f,
-                        body["waterColorW"].asReal()   / 256.f);
-                mWater->set("waterFogDensity", body["waterFogDensityExponent"].asReal());
-                mWater->set("underWaterFogMod", body["underwaterFogModifier"].asReal());
-                mWater->set("normScale", body["reflectionWaveletScaleX"].asReal(),
-                        body["reflectionWaveletScaleY"].asReal(),
-                        body["reflectionWaveletScaleZ"].asReal());
-                mWater->set("fresnelScale", body["fresnelScale"].asReal());
-                mWater->set("fresnelOffset", body["fresnelOffset"].asReal());
-                mWater->set("scaleAbove", body["refractScaleAbove"].asReal());
-                mWater->set("scaleBelow", body["refractScaleBelow"].asReal());
-                mWater->set("blurMultiplier", body["blurMultiplier"].asReal());
-                mWater->set("wave2Dir", body["bigWaveDirectionX"].asReal(),
-                        body["bigWaveDirectionY"].asReal());
-                mWater->set("wave1Dir", body["littleWaveDirectionX"].asReal(),
-                        body["littleWaveDirectionY"].asReal());
-                mWaterNormal->parseUUID(body["normalMapTexture"].asUUID().asString(), mWaterNormal);
-
-                mSky->setSunAngle(body["sunMoonPosition"].asReal());
-                mSky->setEastAngle(body["eastAngle"].asReal());
-
-                mSky->set("sunlight_color",
-                                                body["sunMoonColorX"].asReal() * 3.0f,
-                                                body["sunMoonColorY"].asReal() * 3.0f,
-                                                body["sunMoonColorZ"].asReal() * 3.0f,
-                                                body["sunMoonColorW"].asReal() * 3.0f);
-
-                mSky->set("ambient",
-                                                body["ambientX"].asReal() * 3.0f,
-                                                body["ambientY"].asReal() * 3.0f,
-                                                body["ambientZ"].asReal() * 3.0f,
-                                                body["ambientW"].asReal() * 3.0f);
-
-                mSky->set("blue_horizon",
-                                                body["horizonX"].asReal() * 2.0f,
-                                                body["horizonY"].asReal() * 2.0f,
-                                                body["horizonZ"].asReal() * 2.0f,
-                                                body["horizonW"].asReal() * 2.0f);
-
-                mSky->set("blue_density",
-                                                body["blueDensityX"].asReal(),
-                                                body["blueDensityY"].asReal(),
-                                                body["blueDensityZ"].asReal(),
-                                                1.0);
-
-                mSky->set("haze_horizon",
-                                                body["hazeHorizon"].asReal(),
-                                                body["hazeHorizon"].asReal(),
-                                                body["hazeHorizon"].asReal(),
-                                                1.f);
-
-                mSky->set("haze_density",
-                                                body["hazeDensity"].asReal(),
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("cloud_shadow",
-                                                body["cloudCoverage"].asReal(),
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("density_multiplier",
-                                                body["densityMultiplier"].asReal() / 1000.0f,
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("distance_multiplier",
-                                                body["distanceMultiplier"].asReal(),
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("max_y",
-                                                body["maxAltitude"].asReal(),
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("cloud_color",
-                                                body["cloudColorX"].asReal(),
-                                                body["cloudColorY"].asReal(),
-                                                body["cloudColorZ"].asReal(),
-                                                body["cloudColorW"].asReal());
-
-                mSky->set("cloud_pos_density1",
-                                                body["cloudXYDensityX"].asReal(),
-                                                body["cloudXYDensityY"].asReal(),
-                                                body["cloudXYDensityZ"].asReal(),
-                                                1.f);
-
-                mSky->set("cloud_pos_density2",
-                                                body["cloudDetailXYDensityX"].asReal(),
-                                                body["cloudDetailXYDensityY"].asReal(),
-                                                body["cloudDetailXYDensityZ"].asReal(),
-                                                1.f);
-
-                mSky->set("cloud_scale",
-                                                body["cloudScale"].asReal(),
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("gamma",
-                                                body["sceneGamma"].asReal(),
-                                                0.f, 0.f, 1.f);
-
-                mSky->set("glow",
-                                                (2 - body["sunGlowSize"].asReal()) * 20,
-                                                0.f,
-                                                -body["sunGlowFocus"].asReal() * 5,
-                                                1.f);
-
-        mSky->setCloudScrollX(body["cloudScrollX"].asReal() + 10.0f);
-        mSky->setCloudScrollY(body["cloudScrollY"].asReal() + 10.0f);
-
-        mSky->setEnableCloudScrollX(!body["cloudScrollXLock"].asBoolean());
-        mSky->setEnableCloudScrollY(!body["cloudScrollYLock"].asBoolean());
-
-        mSky->setStarBrightness(body["starBrightness"].asReal());
-
-        mSky->set("fade", body["fade"].asReal());
-
-        //Update this here.. since it isn't a part of WL... go figure
-        gHippoLimits->skyUseClassicClouds = body["drawClassicClouds"].asBoolean();
-        gSavedSettings.setF32("ClassicCloudHeight",body["classicCloudHeight"].asReal());
-        gSavedSettings.setF32("ClassicCloudRange",body["classicCloudRange"].asReal());
-
-        WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
-}
-};
-
-LLHTTPRegistration<WindLightSettingsUpdate>
-gHTTPRegistrationWindLightSettingsUpdate(
-        "/message/WindLightSettingsUpdate");
\ No newline at end of file
diff --git a/linden/indra/newview/wlfloatermanager.cpp b/linden/indra/newview/wlfloatermanager.cpp
index 63abe14..382244d 100644
--- a/linden/indra/newview/wlfloatermanager.cpp
+++ b/linden/indra/newview/wlfloatermanager.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file wlfloaterwindlightsend.cpp
 * @brief WLFloaterWindLightSend class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
+*
 * Copyright (c) 2007-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
@@ -13,17 +13,17 @@
 * ("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.
@@ -70,17 +70,17 @@
 #include "llviewerparcelmgr.h"
 #include "llparcel.h"
 #include "wlretrievesettings.h"
-#include "wlsettingsmanager.h"
+#include "llettherebelight.h"
 #include "wlfloaterwindlightsend.h"
 
 #undef max
 WLFloaterManager* WLFloaterManager::sWindLight;
-std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;    
-std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;      
-std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList; 
-std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList; 
-std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList; 
-std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;   
+std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;
+std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;
+std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList;
+std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList;
+std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList;
+std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;
 
 WLFloaterManager::WLFloaterManager() : LLFloater(std::string("windlight manager floater"))
 {
@@ -214,7 +214,7 @@ void WLFloaterManager::onShow(void* userData)
         LLWaterParamSet* mWater = mgr->mWaterParamList[name];
         LLUUID* mWaterNormal = mgr->mWaterNormalParamList[name];
         if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-                WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
+                LightShare::applyMaybe(mWater, mWaterNormal, mSky);
 }
 void WLFloaterManager::onSetToCurrent(void* userData)
 {
@@ -233,10 +233,10 @@ void WLFloaterManager::onSetToCurrent(void* userData)
         if(name == "(Region Settings)")
         {
                 type = 0;
-        }       
-        
+        }
+
         if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-                WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+                WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal);
 }
 void WLFloaterManager::onRemove(void* userData)
 {
@@ -258,7 +258,7 @@ void WLFloaterManager::onRemove(void* userData)
         }
 
         if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-                WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+                WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal);
 }
 
 
@@ -269,13 +269,12 @@ void WLFloaterManager::UpdateFloater()
         LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
         comboBox->clear();
         comboBox->removeall();
-        std::map<std::string, LLWLParamSet*>::iterator mIt = 
+        std::map<std::string, LLWLParamSet*>::iterator mIt =
                 WLFloaterManager::instance()->mWLParamList.begin();
-        for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++) 
+        for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++)
         {
                 comboBox->add(mIt->first);
         }
         //Reorder them
         comboBox->sortByName();
 }
-
diff --git a/linden/indra/newview/wlretrievesettings.cpp b/linden/indra/newview/wlretrievesettings.cpp
index afa84f2..a8ed2b5 100644
--- a/linden/indra/newview/wlretrievesettings.cpp
+++ b/linden/indra/newview/wlretrievesettings.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file wlfloaterwindlightsend.cpp
 * @brief WLFloaterWindLightSend class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
+*
 * Copyright (c) 2007-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
@@ -13,17 +13,17 @@
 * ("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.
@@ -67,8 +67,7 @@
 #include "hippolimits.h"
 #include "wlfloaterwindlightsend.h"
 #include "llviewerregion.h"
-#include "wlsettingsmanager.h"
-#include "lightshare.h"
+#include "llettherebelight.h"
 
 #include "linden_common.h"
 #include "llviewercontrol.h"
@@ -93,7 +92,7 @@ void retrieveWindlightSettings::result(const LLSD& content)
         for(LLSD::array_const_iterator wls = content["WindLight"].beginArray();
                 wls != content["WindLight"].endArray();
                 ++wls)
-        {       
+        {
                 LLSD windLightLLSD = *wls;
                 LLWaterParamSet* mWater;
                 LLWLParamSet* mSky;
@@ -235,4 +234,4 @@ void retrieveWindlightSettings::error(U32 status, const std::string& reason)
 {
         LL_INFOS("Inventory") << "retrieveWindlightSettings::error "
                 << status << ": " << reason << LL_ENDL;
-}
\ No newline at end of file
+}
diff --git a/linden/indra/newview/wlsettingsmanager.cpp b/linden/indra/newview/wlsettingsmanager.cpp
deleted file mode 100644
index c0a07e1..0000000
--- a/linden/indra/newview/wlsettingsmanager.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/** 
-* @file wlfloaterwindlightsend.cpp
-* @brief WLFloaterWindLightSend class definition
-*
-* $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
-* Copyright (c) 2007-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$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterwindlight.h"
-
-#include "pipeline.h"
-#include "llsky.h"
-
-#include "llsliderctrl.h"
-#include "llmultislider.h"
-#include "llmultisliderctrl.h"
-#include "llspinctrl.h"
-#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
-#include "llviewercamera.h"
-#include "llcombobox.h"
-#include "lllineeditor.h"
-#include "llfloaterdaycycle.h"
-#include "lltabcontainer.h"
-#include "llboost.h"
-
-#include "llagent.h"
-#include "llinventorymodel.h"
-#include "llviewerinventory.h"
-
-#include "v4math.h"
-#include "llviewerdisplay.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llsavedsettingsglue.h"
-
-#include "llwlparamset.h"
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
-#include "llpostprocess.h"
-#include "hippolimits.h"
-#include "wlfloaterwindlightsend.h"
-#include "llviewerregion.h"
-#include "wlsettingsmanager.h"
-#include "lightshare.h"
-
-#include "linden_common.h"
-#include "llviewercontrol.h"
-#include "message.h"
-#include "meta7windlight.h"
-#include "llworld.h"
-
-#undef max
-
-const std::string WLSettingsManager::wlWaterPresetName = "(Region settings)";
-const std::string WLSettingsManager::wlSkyPresetName   = "(Region settings)";
-
-LLTimer* WLSettingsManager::wlIgnoreTimer = new LLTimer();
-bool WLSettingsManager::wlIgnoreRegion = false;
-LLWaterParamSet* WLSettingsManager::mWater = NULL;
-LLWLParamSet* WLSettingsManager::mSky = NULL;
-LLUUID* WLSettingsManager::mWaterNormal = NULL;
-
-void WLSettingsManager::Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal )
-{
-        if( gSavedSettings.getU32("LightShareAllowed") <= WindlightMessage::LIGHTSHARE_NEVER )
-                return;
-
-        std::string water = LLWaterParamManager::instance()->mCurParams.mName;
-        std::string sky = LLWLParamManager::instance()->mCurParams.mName;
-
-        // If they are using region settings already, or LightShare is
-        // always allowed, just apply the new settings, don't bother asking.
-        if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ALWAYS ||
-            (sky == wlSkyPresetName && water == wlWaterPresetName) )
-        {
-                mSky = Sky;
-                mWater = Water;
-                mWaterNormal = WaterNormal;
-                Apply();
-                return;
-        }
-
-        if( !wlignoreTimerHasExpired() )
-        {
-                // The user recently ignored a windlight message, so ignore
-                // this one too, and restart the timer.
-                wlrestartIgnoreTimer();
-                return;
-        }
-
-        if(wlIgnoreRegion)
-        {
-                // We are ignoring new settings until user enters a new region.
-                return;
-        }
-
-        if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ASK &&
-            mSky == NULL && mWater == NULL)
-        {
-                // No most recent, so store this and create notification
-                // asking the user whether to apply or not.
-                mSky = Sky;
-                mWater = Water;
-                mWaterNormal = WaterNormal;
-                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
-                                                boost::bind(&wlapplyCallback, _1, _2));
-        }
-        else
-        {
-                // No new notification (to avoid spamming the user, we do keep the saves from above)
-                mSky = Sky;
-                mWater = Water;
-                mWaterNormal = WaterNormal;
-        }
-}
-
-// static
-bool WLSettingsManager::wlapplyCallback(const LLSD& notification,
-                                     const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-
-        switch(option)
-        {
-                case 0:{
-                        // "Apply"
-                        Apply();
-                        break;
-                }
-                case 1:{
-                        // "Not Now", ignore until the region stops spamming
-                        wlrestartIgnoreTimer();
-                        break;
-                }
-                case 2:{
-                        // "Ignore", ignore all until user leaves the region
-                        wlIgnoreRegion = true;
-                        break;
-                }
-        }
-        return false;
-}
-
-//static
-void WLSettingsManager::Apply()
-{
-        LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
-        LLWLParamManager* sky_mgr = LLWLParamManager::instance();
-
-        F32 fade = 0; //Instant
-        bool error;
-        fade = mSky->getFloat("fade", error);
-
-        mWater->mName = wlWaterPresetName;
-        if(fade != 0 && water_mgr->mCurParams.mName == wlWaterPresetName)//Load the settings forcefully the first time
-        {
-                LLWaterParamSet oldWset = water_mgr->mCurParams;
-                //This still needs done so that we update right, but load it to the old
-                water_mgr->removeParamSet( wlWaterPresetName, false );
-                water_mgr->addParamSet( wlWaterPresetName, oldWset );
-                water_mgr->savePreset( wlWaterPresetName );
-                water_mgr->loadPreset( wlWaterPresetName, true );
-                water_mgr->setNormalMapID( *mWaterNormal );
-                //Then mix with the new
-                water_mgr->SetMixTime(mWater, fade);
-        }
-        else
-        {
-                //Instant if fade is 0
-                water_mgr->removeParamSet( wlWaterPresetName, false );
-                water_mgr->addParamSet( wlWaterPresetName, *mWater );
-                water_mgr->savePreset( wlWaterPresetName );
-                water_mgr->loadPreset( wlWaterPresetName, true );
-                water_mgr->setNormalMapID( *mWaterNormal );
-        }
-
-        mSky->mName = wlSkyPresetName;
-        if(fade != 0 && sky_mgr->mCurParams.mName == wlSkyPresetName)//Load the settings forcefully the first time
-        {
-                LLWLParamSet oldset = sky_mgr->mCurParams;
-                //This still needs done so that we update right, but load it to the old
-                sky_mgr->removeParamSet( wlSkyPresetName, true );
-                sky_mgr->addParamSet( wlSkyPresetName, oldset );
-                sky_mgr->savePreset( wlSkyPresetName );
-                sky_mgr->loadPreset( wlSkyPresetName, true );
-                //Then mix with the new
-                sky_mgr->SetMixTime(mSky, fade);
-        }
-        else
-        {
-                //Instant if fade is 0
-                sky_mgr->mAnimator.mIsRunning = false;
-                sky_mgr->mAnimator.mUseLindenTime = false;
-                sky_mgr->removeParamSet( wlSkyPresetName, false );
-                sky_mgr->addParamSet( wlSkyPresetName, *mSky );
-                sky_mgr->savePreset( wlSkyPresetName );
-                sky_mgr->loadPreset( wlSkyPresetName, true );
-        }
-
-        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-
-        mSky = NULL;
-        mWater = NULL;
-        mWaterNormal = NULL;
-}
-
-// static
-void WLSettingsManager::wlresetRegion()
-{
-        wlIgnoreRegion = false;
-        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-}
-
-// static
-void WLSettingsManager::wlrestartIgnoreTimer()
-{
-        F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
-        wlIgnoreTimer->start();
-        wlIgnoreTimer->setTimerExpirySec( (time < 0) ? 0 : time );
-}
-
-// static
-bool WLSettingsManager::wlignoreTimerHasExpired()
-{
-        return wlIgnoreTimer->hasExpired();
-}
\ No newline at end of file
diff --git a/linden/indra/newview/wlsettingsmanager.h b/linden/indra/newview/wlsettingsmanager.h
deleted file mode 100644
index 5a0e9e7..0000000
--- a/linden/indra/newview/wlsettingsmanager.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/** 
- * @file wlfloaterwindlightsend.h
- * @brief WLFloaterWindLightSend class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-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$
- */
-
-/*
- * Menu for adjusting the atmospheric settings of the world
- */
-
-#ifndef WINDLIGHTSETTINGSMANAGER_H
-#define WINDLIGHTSETTINGSMANAGER_H
-
-#include <string>
-#include "llwlparamset.h"
-#include "llwaterparamset.h"
-#include "lluuid.h"
-
-class LLSD;
-class LLTimer;
-class LLUUID;
-class LLWaterParamSet;
-class LLWLParamSet;
-
-
-/// Menuing system for all of windlight's functionality
-class WLSettingsManager
-{
-public:
-
-        static LLTimer* wlIgnoreTimer;
-        static bool wlIgnoreRegion;
-
-        // Called after the user has entered a new region, to reset the
-        // "ignore while in this region" state.
-        static void wlresetRegion();
-
-        static void Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal );
-
-        // Callback when the user interacts with the notification.
-        static bool wlapplyCallback(const LLSD& notification,
-                                  const LLSD& response);
-
-        static LLWaterParamSet* mWater;
-        static LLWLParamSet* mSky;
-        static LLUUID* mWaterNormal;
-
-private:
-        static void Apply();
-
-        // The name of the water preset where the region settings are stored.
-        static const std::string wlWaterPresetName;
-
-        // The name of the sky preset where the region settings are stored.
-        static const std::string wlSkyPresetName;
-
-        // Restart the timer for temporarily ignoring settings.
-        static void wlrestartIgnoreTimer();
-
-        // Returns true if the ignore timer has expired (i.e. new settings
-        // should not be ignored anymore).
-        static bool wlignoreTimerHasExpired();
-};
-#endif
\ No newline at end of file
diff --git a/linden/indra/test_apps/llplugintest/CMakeLists.txt b/linden/indra/test_apps/llplugintest/CMakeLists.txt
index a6cb740..91ba2db 100644
--- a/linden/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/linden/indra/test_apps/llplugintest/CMakeLists.txt
@@ -311,7 +311,7 @@ endif (DARWIN OR LINUX)
 if (DARWIN)
   # path inside the app bundle where we'll need to copy plugins and other related files
   set(PLUGINS_DESTINATION_DIR
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources
   )
   
   # create the Contents/Resources directory
@@ -326,7 +326,7 @@ if (DARWIN)
   ) 
 else (DARWIN)
   set(PLUGINS_DESTINATION_DIR
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
   )
 endif (DARWIN)